cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r240:700050c502ba` public

parent | child

Description:

add --only-error to grader script

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r240:700050c502ba - Wed, 11 Oct 2017 10:22:52 - 5 files changed: 16 inserted, 7 deleted

grader ¶ +2

                        additional options:
                           --all-sub      re-grade every submissions instead of just the latest submission of each user.
+            + 	    --only-error   re-grade only submissions that are "error during grading"
                 sub:   re-grader the specified submission.
                        The submission ID to be re-graded must be specified by the next argument.
                 end
                 options[:all_sub] = (ARGV.delete('--all-sub') != nil)
+            +   options[:only_err] = (ARGV.delete('--only-error') != nil)
                 options[:err_log] = (ARGV.delete('--err-log') != nil)

grader-process-check ¶ +4 -3

@@ -1,6 +1,7
1	#!/bin/bash	1	#!/bin/bash
2	- count=`ps aux \| grep "~~cafe~~_grader" \| grep "grader grading queue" \| wc -l`	2	+ count=`ps aux \| grep "algo_grader" \| grep "grader grading queue" \| wc -l`
3	if [ $count -lt 1 ]; then	3	if [ $count -lt 1 ]; then
4	- cd /home/dae/~~cafe~~_grader/judge	4	+ cd /home/dae/algo_grader/judge
5	- /home/dae/.rvm/wrappers/ruby-2.3.0/ruby /home/dae/~~cafe~~_grader/judge/scripts/grader grading queue > /home/dae/grading.log &	5	+ /home/dae/.rvm/wrappers/ruby-2.3.0/ruby /home/dae/algo_grader/judge/scripts/grader grading queue > /home/dae/grading.log &
6	fi	6	fi
		7	+

lib/runner.rb ¶ +6 -2

                   end
                   def grade_problem(problem, options={})
+            +       user_index = 0
+            +       user_count = User.count
                     User.find_each do |u|
-            -         puts "user: #{u.login}"
+            +         puts "user: #{u.login} (#{user_index}/#{user_count})"
+            +         user_index += 1
                       if options[:user_conditions]!=nil
                         con_proc = options[:user_conditions]
                         next if not con_proc.call(u)
                       end
                       if options[:all_sub]
                         Submission.where(user_id: u.id,problem_id: problem.id).find_each do |sub|
+            +             next if options[:only_err] and sub.grader_comment != 'error during grading'
                           @engine.grade(sub)
                         end
                       else
                         last_sub = Submission.find_last_by_user_and_problem(u.id,problem.id)
                         if last_sub!=nil
-            -             @engine.grade(last_sub)
+            +             @engine.grade(last_sub) unless options[:only_err] and last_sub.grader_comment != 'error during grading'
                         end
                       end
                     end

lib/submission_helper.rb ¶ +3 -1

                       #submission.grader_comment = 'FAILED: ' + comment
                       submission.grader_comment = comment
                     end
-            -       submission.compiler_message = result[:cmp_msg] or ''
+            +       #very lazy trim the string
+            +       submission.compiler_message = result[:cmp_msg][0..60000] or ''
                     if not @dry_run
                       submission.save

std-script/run ¶ +1 -1

               #
               JAVA_OPTION = "-s set_robust_list -s futex -s clone -s getppid -s clone -s wait4 -p /usr/bin/ -p ./"
-            - 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"
+            + 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"
               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"
               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"
               HASKELL_OPTION = "-s set_robust_list -s clock_gettime -s sysinfo -s timer_create -s timer_settime -s futex -s timer_delete"

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r240:700050c502ba - Wed, 11 Oct 2017 10:22:52 - 5 files changed: 16 inserted, 7 deleted

Sign in to your account

Commit r240:700050c502ba public

Author

r240:700050c502ba - Wed, 11 Oct 2017 10:22:52 - 5 files changed: 16 inserted, 7 deleted

Commit `r240:700050c502ba` public