Description:
merge to master
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r253:0654ec1bf773 - - 6 files changed: 24 inserted, 13 deleted
@@ -0,0 +1,9 | |||||
|
|
1 | + #!/bin/bash | ||
|
|
2 | + count=`ps aux | grep "algo_grader" | grep "grader grading queue" | wc -l` | ||
|
|
3 | + install_dir=/home/john/cafe_grader | ||
|
|
4 | + ruby_executable=/home/john/.rvm/wrappers/ruby-2.3.0/ruby | ||
|
|
5 | + if [ $count -lt 1 ]; then | ||
|
|
6 | + cd $judge_dir/judge | ||
|
|
7 | + $ruby_executable $install_dir/judge/scripts/grader grading queue > $install_dir/judge/grading.log & | ||
|
|
8 | + fi | ||
|
|
9 | + |
@@ -48,25 +48,26 | |||||
|
48 | using: (1) grader |
|
48 | using: (1) grader |
|
49 | (2) grader environment [mode] [options] |
|
49 | (2) grader environment [mode] [options] |
|
50 | (3) grader stop [all|pids-list] |
|
50 | (3) grader stop [all|pids-list] |
|
51 | (4) grader --help |
|
51 | (4) grader --help |
|
52 | (1) call grader with environment = 'exam', mode = 'queue' |
|
52 | (1) call grader with environment = 'exam', mode = 'queue' |
|
53 | (2) possible modes are: 'queue', 'test_request', 'prob', 'sub', 'contest', and 'autonew' |
|
53 | (2) possible modes are: 'queue', 'test_request', 'prob', 'sub', 'contest', and 'autonew' |
|
54 | queue: repeatedly check the task queue and grade any available tasks |
|
54 | queue: repeatedly check the task queue and grade any available tasks |
|
55 |
|
55 | ||
|
56 | prob: re-grade every user latest submission of the specific problem. |
|
56 | prob: re-grade every user latest submission of the specific problem. |
|
57 | the problem name must be specified by the next argument. |
|
57 | the problem name must be specified by the next argument. |
|
58 |
|
58 | ||
|
59 | additional options: |
|
59 | additional options: |
|
60 | - --all-sub re-grade every submissions instead of just the latest submission of each user. |
|
60 | + --all-sub re-grade every submissions instead of just the latest submission of each user. |
|
|
61 | + --only-error re-grade only submissions that are "error during grading" | ||
|
61 |
|
62 | ||
|
62 | sub: re-grader the specified submission. |
|
63 | sub: re-grader the specified submission. |
|
63 | The submission ID to be re-graded must be specified by the next argument. |
|
64 | The submission ID to be re-graded must be specified by the next argument. |
|
64 |
|
65 | ||
|
65 | options: |
|
66 | options: |
|
66 | --err-log log error to a file in the log dir |
|
67 | --err-log log error to a file in the log dir |
|
67 |
|
68 | ||
|
68 | (3) create stop-file to stop running grader in queue mode |
|
69 | (3) create stop-file to stop running grader in queue mode |
|
69 | (4) You are here. |
|
70 | (4) You are here. |
|
70 | USAGE |
|
71 | USAGE |
|
71 | end |
|
72 | end |
|
72 |
|
73 | ||
@@ -127,24 +128,25 | |||||
|
127 | if options[:dry_run] and (not ['prob','contest','autonew'].include? options[:mode]) |
|
128 | if options[:dry_run] and (not ['prob','contest','autonew'].include? options[:mode]) |
|
128 | puts "Dry run currently works only for 'prob' or 'contest' modes." |
|
129 | puts "Dry run currently works only for 'prob' or 'contest' modes." |
|
129 | exit(0) |
|
130 | exit(0) |
|
130 | end |
|
131 | end |
|
131 |
|
132 | ||
|
132 | options[:report] = (ARGV.delete('--report') != nil) |
|
133 | options[:report] = (ARGV.delete('--report') != nil) |
|
133 | if options[:report] and (not ['prob','contest','autonew'].include? options[:mode]) |
|
134 | if options[:report] and (not ['prob','contest','autonew'].include? options[:mode]) |
|
134 | puts "Report currently works only for 'prob' or 'contest' modes." |
|
135 | puts "Report currently works only for 'prob' or 'contest' modes." |
|
135 | exit(0) |
|
136 | exit(0) |
|
136 | end |
|
137 | end |
|
137 |
|
138 | ||
|
138 | options[:all_sub] = (ARGV.delete('--all-sub') != nil) |
|
139 | options[:all_sub] = (ARGV.delete('--all-sub') != nil) |
|
|
140 | + options[:only_err] = (ARGV.delete('--only-error') != nil) | ||
|
139 |
|
141 | ||
|
140 | options[:err_log] = (ARGV.delete('--err-log') != nil) |
|
142 | options[:err_log] = (ARGV.delete('--err-log') != nil) |
|
141 |
|
143 | ||
|
142 | return options |
|
144 | return options |
|
143 | end |
|
145 | end |
|
144 |
|
146 | ||
|
145 | class ResultCollector |
|
147 | class ResultCollector |
|
146 | def initialize |
|
148 | def initialize |
|
147 | @results = {} |
|
149 | @results = {} |
|
148 | @problems = {} |
|
150 | @problems = {} |
|
149 | @users = {} |
|
151 | @users = {} |
|
150 | end |
|
152 | end |
@@ -16,38 +16,42 | |||||
|
16 | if task!=nil |
|
16 | if task!=nil |
|
17 | @grader_process.report_active(task) if @grader_process!=nil |
|
17 | @grader_process.report_active(task) if @grader_process!=nil |
|
18 |
|
18 | ||
|
19 | submission = Submission.find(task.submission_id) |
|
19 | submission = Submission.find(task.submission_id) |
|
20 | @engine.grade(submission) |
|
20 | @engine.grade(submission) |
|
21 | task.status_complete! |
|
21 | task.status_complete! |
|
22 | @grader_process.report_inactive(task) if @grader_process!=nil |
|
22 | @grader_process.report_inactive(task) if @grader_process!=nil |
|
23 | end |
|
23 | end |
|
24 | return task |
|
24 | return task |
|
25 | end |
|
25 | end |
|
26 |
|
26 | ||
|
27 | def grade_problem(problem, options={}) |
|
27 | def grade_problem(problem, options={}) |
|
|
28 | + user_index = 0 | ||
|
|
29 | + user_count = User.count | ||
|
28 | User.find_each do |u| |
|
30 | User.find_each do |u| |
|
29 | - puts "user: #{u.login}" |
|
31 | + puts "user: #{u.login} (#{user_index}/#{user_count})" |
|
|
32 | + user_index += 1 | ||
|
30 | if options[:user_conditions]!=nil |
|
33 | if options[:user_conditions]!=nil |
|
31 | con_proc = options[:user_conditions] |
|
34 | con_proc = options[:user_conditions] |
|
32 | next if not con_proc.call(u) |
|
35 | next if not con_proc.call(u) |
|
33 | end |
|
36 | end |
|
34 | if options[:all_sub] |
|
37 | if options[:all_sub] |
|
35 | Submission.where(user_id: u.id,problem_id: problem.id).find_each do |sub| |
|
38 | Submission.where(user_id: u.id,problem_id: problem.id).find_each do |sub| |
|
|
39 | + next if options[:only_err] and sub.grader_comment != 'error during grading' | ||
|
36 | @engine.grade(sub) |
|
40 | @engine.grade(sub) |
|
37 | end |
|
41 | end |
|
38 | else |
|
42 | else |
|
39 | last_sub = Submission.find_last_by_user_and_problem(u.id,problem.id) |
|
43 | last_sub = Submission.find_last_by_user_and_problem(u.id,problem.id) |
|
40 | if last_sub!=nil |
|
44 | if last_sub!=nil |
|
41 | - @engine.grade(last_sub) |
|
45 | + @engine.grade(last_sub) unless options[:only_err] and last_sub.grader_comment != 'error during grading' |
|
42 | end |
|
46 | end |
|
43 | end |
|
47 | end |
|
44 | end |
|
48 | end |
|
45 | end |
|
49 | end |
|
46 |
|
50 | ||
|
47 | def grade_submission(submission) |
|
51 | def grade_submission(submission) |
|
48 | puts "Submission: #{submission.id} by #{submission.try(:user).try(:full_name)}" |
|
52 | puts "Submission: #{submission.id} by #{submission.try(:user).try(:full_name)}" |
|
49 | @engine.grade(submission) |
|
53 | @engine.grade(submission) |
|
50 | end |
|
54 | end |
|
51 |
|
55 | ||
|
52 | def grade_oldest_test_request |
|
56 | def grade_oldest_test_request |
|
53 | test_request = TestRequest.get_inqueue_and_change_status(Task::STATUS_GRADING) |
|
57 | test_request = TestRequest.get_inqueue_and_change_status(Task::STATUS_GRADING) |
@@ -131,22 +131,24 | |||||
|
131 | # |
|
131 | # |
|
132 | if problem == nil |
|
132 | if problem == nil |
|
133 | submission.grader_comment = 'PASSED: ' + comment + '(problem is nil)' |
|
133 | submission.grader_comment = 'PASSED: ' + comment + '(problem is nil)' |
|
134 | elsif points == problem.full_score |
|
134 | elsif points == problem.full_score |
|
135 | #submission.grader_comment = 'PASSED: ' + comment |
|
135 | #submission.grader_comment = 'PASSED: ' + comment |
|
136 | submission.grader_comment = comment |
|
136 | submission.grader_comment = comment |
|
137 | elsif result[:comment].chomp =~ /^[\[\]P]+$/ |
|
137 | elsif result[:comment].chomp =~ /^[\[\]P]+$/ |
|
138 | submission.grader_comment = 'PASSED: ' + comment + '(inconsistent score)' |
|
138 | submission.grader_comment = 'PASSED: ' + comment + '(inconsistent score)' |
|
139 | else |
|
139 | else |
|
140 | #submission.grader_comment = 'FAILED: ' + comment |
|
140 | #submission.grader_comment = 'FAILED: ' + comment |
|
141 | submission.grader_comment = comment |
|
141 | submission.grader_comment = comment |
|
142 | end |
|
142 | end |
|
143 | - submission.compiler_message = result[:cmp_msg] or '' |
|
143 | + |
|
|
144 | + #very lazy trim the string | ||
|
|
145 | + submission.compiler_message = result[:cmp_msg][0..60000] or '' | ||
|
144 |
|
146 | ||
|
145 | if not @dry_run |
|
147 | if not @dry_run |
|
146 | submission.save |
|
148 | submission.save |
|
147 | end |
|
149 | end |
|
148 | end |
|
150 | end |
|
149 |
|
151 | ||
|
150 | end |
|
152 | end |
|
151 |
|
153 | ||
|
152 | end |
|
154 | end |
@@ -82,47 +82,47 | |||||
|
82 | "#{problem_home}/script/box") |
|
82 | "#{problem_home}/script/box") |
|
83 | end |
|
83 | end |
|
84 |
|
84 | ||
|
85 | # Hide PROBLEM_HOME |
|
85 | # Hide PROBLEM_HOME |
|
86 | ENV['PROBLEM_HOME'] = nil |
|
86 | ENV['PROBLEM_HOME'] = nil |
|
87 | ENV['SOURCE_NAME'] = nil |
|
87 | ENV['SOURCE_NAME'] = nil |
|
88 |
|
88 | ||
|
89 | # Run the program. |
|
89 | # Run the program. |
|
90 | #run_command = "/usr/bin/time -f \"#{time_output_format}\" 2>run_result #{problem_home}/script/box_new -a 2 -f -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name}" |
|
90 | #run_command = "/usr/bin/time -f \"#{time_output_format}\" 2>run_result #{problem_home}/script/box_new -a 2 -f -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name}" |
|
91 | # |
|
91 | # |
|
92 |
|
92 | ||
|
93 | JAVA_OPTION = "-s set_robust_list -s futex -s clone -s getppid -s clone -s wait4 -p /usr/bin/ -p ./" |
|
93 | JAVA_OPTION = "-s set_robust_list -s futex -s clone -s getppid -s clone -s wait4 -p /usr/bin/ -p ./" |
|
94 | - RUBY_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /lib64/ -p /dev/urandom -p #{sandbox_dir}/#{program_name} -p #{sandbox_dir}/ -s set_robust_list -s sched_getaffinity -s clock_gettime -s sigaltstack -s pipe2 -s clone -s futex -s openat -s pipe" |
|
94 | + RUBY_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /lib64/ -p /dev/urandom -p #{sandbox_dir}/#{program_name} -p #{sandbox_dir}/ -s set_robust_list -s sched_getaffinity -s clock_gettime -s sigaltstack -s pipe2 -s clone -s futex -s openat -s pipe -s getrandom" |
|
95 | PYTHON_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /usr/bin/ -p /lib64/ -p /dev/urandom -p /usr/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p #{sandbox_dir}/#{source_name} -p /proc/sys/crypto/fips_enabled -p /proc/self/status -p /proc/mounts -p /var/lib/dpkg/status -s statfs -s set_robust_list -s openat -s sysinfo -s recvmsg -s connect -s socket -s sendto -s futex -s sigaltstack -s getrandom -E PYTHONNOUSERSITE=yes" |
|
95 | PYTHON_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /usr/bin/ -p /lib64/ -p /dev/urandom -p /usr/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p #{sandbox_dir}/#{source_name} -p /proc/sys/crypto/fips_enabled -p /proc/self/status -p /proc/mounts -p /var/lib/dpkg/status -s statfs -s set_robust_list -s openat -s sysinfo -s recvmsg -s connect -s socket -s sendto -s futex -s sigaltstack -s getrandom -E PYTHONNOUSERSITE=yes" |
|
96 | PHP_OPTION = "-p /usr/lib64/ -p/lib64/ -p /usr/bin/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p /usr/share/ -s setfsuid -s setfsgid -s openat -s set_robust_list -s futex -s clone -s socket -s connect" |
|
96 | PHP_OPTION = "-p /usr/lib64/ -p/lib64/ -p /usr/bin/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p /usr/share/ -s setfsuid -s setfsgid -s openat -s set_robust_list -s futex -s clone -s socket -s connect" |
|
97 | HASKELL_OPTION = "-s set_robust_list -s clock_gettime -s sysinfo -s timer_create -s timer_settime -s futex -s timer_delete" |
|
97 | HASKELL_OPTION = "-s set_robust_list -s clock_gettime -s sysinfo -s timer_create -s timer_settime -s futex -s timer_delete" |
|
98 |
|
98 | ||
|
99 | case language |
|
99 | case language |
|
100 | when "java" |
|
100 | when "java" |
|
101 | # for java, extract the classname |
|
101 | # for java, extract the classname |
|
102 | # wne have to add additional systemcall and we don't check the mem limit (dunno how to fix...) |
|
102 | # wne have to add additional systemcall and we don't check the mem limit (dunno how to fix...) |
|
103 | classname = 'DUMMY' |
|
103 | classname = 'DUMMY' |
|
104 | File.open(program_name,"r").each do |line| |
|
104 | File.open(program_name,"r").each do |line| |
|
105 | classname = line |
|
105 | classname = line |
|
106 | end |
|
106 | end |
|
107 | #for java, we cannot really check the memory limit... |
|
107 | #for java, we cannot really check the memory limit... |
|
108 | run_command = "#{problem_home}/script/box -a 3 -f -T -t #{time_limit} #{JAVA_OPTION} -i #{input_file_name} -o output.txt /usr/bin/java -A -Xmx#{mem_limit}k -A #{classname} " |
|
108 | run_command = "#{problem_home}/script/box -a 3 -f -T -t #{time_limit} #{JAVA_OPTION} -i #{input_file_name} -o output.txt /usr/bin/java -A -Xmx#{mem_limit}k -A #{classname} " |
|
109 | when "ruby" |
|
109 | when "ruby" |
|
110 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{RUBY_OPTION} -i #{input_file_name} -o output.txt /usr/bin/ruby #{program_name} " |
|
110 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{RUBY_OPTION} -i #{input_file_name} -o output.txt /usr/bin/ruby #{program_name} " |
|
111 | when "python" |
|
111 | when "python" |
|
112 |
- run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{[12 |
|
112 | + run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{[512 * 1024,mem_limit].max} #{PYTHON_OPTION} -i #{input_file_name} -o output.txt /usr/bin/python3 #{program_name} " |
|
113 | when "haskell" |
|
113 | when "haskell" |
|
114 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit} -m #{[512 * 1024,mem_limit].max} #{HASKELL_OPTION} -i #{input_file_name} -o output.txt #{program_name} " |
|
114 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit} -m #{[512 * 1024,mem_limit].max} #{HASKELL_OPTION} -i #{input_file_name} -o output.txt #{program_name} " |
|
115 | when "php" |
|
115 | when "php" |
|
116 |
- run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{[12 |
|
116 | + run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{[512 * 1024,mem_limit].max} #{PHP_OPTION} -i #{input_file_name} -o output.txt /usr/bin/php -A -d -A memory_limit=#{mem_limit}k -A #{program_name} " |
|
117 | else # for c++, pascal, we do the normal checking |
|
117 | else # for c++, pascal, we do the normal checking |
|
118 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name} " |
|
118 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name} " |
|
119 | end |
|
119 | end |
|
120 |
|
120 | ||
|
121 |
|
121 | ||
|
122 | log "Running test #{test_num}..." |
|
122 | log "Running test #{test_num}..." |
|
123 | log run_command |
|
123 | log run_command |
|
124 | log |
|
124 | log |
|
125 | system(run_command,err: 'run_result') |
|
125 | system(run_command,err: 'run_result') |
|
126 |
|
126 | ||
|
127 | # Restore PROBLEM_HOME |
|
127 | # Restore PROBLEM_HOME |
|
128 | ENV['PROBLEM_HOME'] = problem_home |
|
128 | ENV['PROBLEM_HOME'] = problem_home |
deleted file |
You need to be logged in to leave comments.
Login now