Description:
merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r247:47c98faa5421 - - 9 files changed: 134 inserted, 8 deleted
@@ -0,0 +1,6 | |||
|
1 | + #!/bin/bash | |
|
2 | + count=`ps aux | grep "cafe_grader" | grep "grader grading queue" | wc -l` | |
|
3 | + if [ $count -lt 1 ]; then | |
|
4 | + cd /home/dae/cafe_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 & | |
|
6 | + fi |
@@ -0,0 +1,85 | |||
|
1 | + #!/usr/bin/env ruby | |
|
2 | + | |
|
3 | + def config | |
|
4 | + Grader::Configuration.get_instance | |
|
5 | + end | |
|
6 | + | |
|
7 | + def display_manual | |
|
8 | + puts <<USAGE | |
|
9 | + load_testcases | |
|
10 | + using: load_testcases [problem_name ...] | |
|
11 | + problem_name are list of "short name" of the problems | |
|
12 | + | |
|
13 | + options: | |
|
14 | + --dry-run do nothing, just simulate the run | |
|
15 | + --all import all problem. This might take several minutes | |
|
16 | + | |
|
17 | + USAGE | |
|
18 | + end | |
|
19 | + | |
|
20 | + def process_options_and_stop_file | |
|
21 | + | |
|
22 | + # Process 'help' option | |
|
23 | + if (ARGV.length == 0) or ((ARGV.length==1) and (/help/.match(ARGV[0]))) | |
|
24 | + display_manual | |
|
25 | + exit(0) | |
|
26 | + end | |
|
27 | + | |
|
28 | + #default options | |
|
29 | + options = { | |
|
30 | + :dry_run => false, | |
|
31 | + } | |
|
32 | + | |
|
33 | + options[:dry_run] = (ARGV.delete('--dry') != nil) | |
|
34 | + options[:all] = (ARGV.delete('--all') != nil) | |
|
35 | + | |
|
36 | + return options | |
|
37 | + end | |
|
38 | + | |
|
39 | + def process_problem(prob,dry_run = false) | |
|
40 | + prob.testcases.destroy_all | |
|
41 | + testcases_root = File.expand_path(GRADER_ROOT+"/../ev/#{prob.name}/test_cases/") | |
|
42 | + num = 1 | |
|
43 | + puts "Processing problem #{prob.name}" | |
|
44 | + loop do | |
|
45 | + file_root = testcases_root + "/#{num}/" | |
|
46 | + puts " checking file #{file_root}" | |
|
47 | + break unless File.exists? file_root | |
|
48 | + input = File.read(file_root + "/input-#{num}.txt") | |
|
49 | + answer = File.read(file_root + "/answer-#{num}.txt") | |
|
50 | + puts " got test case ##{num} of size #{input.size} and #{answer.size}" | |
|
51 | + | |
|
52 | + #THIS IS JUST A PLACE HOLDER | |
|
53 | + group = num #this is wrong!!! fix it!! | |
|
54 | + score = 10 | |
|
55 | + #BEWARE | |
|
56 | + | |
|
57 | + prob.testcases.create(input: input,sol: answer, num: num, score:score,group: group) unless dry_run | |
|
58 | + num += 1 | |
|
59 | + end | |
|
60 | + end | |
|
61 | + | |
|
62 | + ######################################### | |
|
63 | + # main program | |
|
64 | + ######################################### | |
|
65 | + | |
|
66 | + options = process_options_and_stop_file | |
|
67 | + | |
|
68 | + # load grader environment | |
|
69 | + GRADER_ENV = 'grading' | |
|
70 | + require File.join(File.dirname(__FILE__),'config/environment') | |
|
71 | + | |
|
72 | + # boot rails, to be able to use the active record | |
|
73 | + RAILS_ENV = config.rails_env | |
|
74 | + require RAILS_ROOT + '/config/environment' | |
|
75 | + | |
|
76 | + if options[:all] | |
|
77 | + Problem.all.each { |prob| process_problem(prob,options[:dry_run]) } | |
|
78 | + else | |
|
79 | + ARGV.each do |name| | |
|
80 | + prob = Problem.find_by(name: name) | |
|
81 | + process_problem(prob,options[:dry_run]) if prob | |
|
82 | + puts "Cannot find the problem #{name}" unless prob | |
|
83 | + end | |
|
84 | + end | |
|
85 | + |
@@ -145,6 +145,12 | |||
|
145 | 145 | end |
|
146 | 146 | end |
|
147 | 147 | |
|
148 | + #also include any .txt files | |
|
149 | + Dir.glob("#{testcase_dir}/*.txt") do |file| | |
|
150 | + puts "copy data file #{file}" | |
|
151 | + FileUtils.cp(file,"#{problem_dir}") | |
|
152 | + end | |
|
153 | + | |
|
148 | 154 | # generating all_tests.cfg |
|
149 | 155 | puts "generating testcase config file" |
|
150 | 156 |
@@ -15,7 +15,7 | |||
|
15 | 15 | sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev \ |
|
16 | 16 | ncurses-dev automake libtool bison subversion \ |
|
17 | 17 | pkg-config curl nodejs unzip pyflakes ruby default-jdk \ |
|
18 | - libmysqld-dev mercurial python-setuptools python-dev | |
|
18 | + libmysqld-dev mercurial python-setuptools python-dev python3-numpy | |
|
19 | 19 | |
|
20 | 20 | echo "Installing RVM" |
|
21 | 21 | curl -k -L https://get.rvm.io | bash -s stable |
@@ -8,7 +8,7 | |||
|
8 | 8 | |
|
9 | 9 | def rename_problem(old_problem_name, new_problem_name) |
|
10 | 10 | |
|
11 |
- |
|
|
11 | + unless valid_problem_name(new_problem_name) | |
|
12 | 12 | puts "Bad new problem name: #{new_problem_name}" |
|
13 | 13 | return |
|
14 | 14 | end |
@@ -60,7 +60,7 | |||
|
60 | 60 | if name.length==0: |
|
61 | 61 | return false |
|
62 | 62 | else |
|
63 |
- return |
|
|
63 | + return (/^[a-zA-Z0-9_\-]+$/ === name) | |
|
64 | 64 | end |
|
65 | 65 | end |
|
66 | 66 |
@@ -603,6 +603,18 | |||
|
603 | 603 | /* 311 */ [ __NR_process_vm_writev ] = "process_vm_writev", |
|
604 | 604 | /* 312 */ [ __NR_kcmp ] = "kcmp", |
|
605 | 605 | /* 313 */ [ __NR_finit_module ] = "finit_module", |
|
606 | + /* 314 */ [ __NR_sched_setattr ] = "sched_setattr", | |
|
607 | + /* 315 */ [ __NR_sched_getattr ] = "sched_getattr", | |
|
608 | + /* 316 */ [ __NR_renameat2 ] = "renameat2", | |
|
609 | + /* 317 */ [ __NR_seccomp ] = "seccomp", | |
|
610 | + /* 318 */ [ __NR_getrandom ] = "getrandom", | |
|
611 | + /* 319 */ [ __NR_memfd_create ] = "memfd_create", | |
|
612 | + /* 320 */ [ __NR_kexec_file_load ] = "kexec_file_load", | |
|
613 | + /* 321 */ [ __NR_bpf ] = "bpf", | |
|
614 | + /* 322 */ [ __NR_execveat ] = "execveat", | |
|
615 | + /* 323 */ [ __NR_userfaultfd ] = "userfaultfd", | |
|
616 | + /* 324 */ [ __NR_membarrier ] = "membarrier", | |
|
617 | + /* 325 */ [ __NR_mlock2 ] = "mlock2", | |
|
606 | 618 | }; |
|
607 | 619 | #define NUM_SYSCALLS ARRAY_SIZE(syscall_names) |
|
608 | 620 | #define NUM_ACTIONS (NUM_SYSCALLS+64) |
@@ -31,6 +31,7 | |||
|
31 | 31 | PYTHON_INTERPRETER = "/usr/bin/python3" |
|
32 | 32 | PYTHON_CHECKER = "/usr/bin/pyflakes" |
|
33 | 33 | PHP_INTERPRETER = "/usr/bin/php" |
|
34 | + HASKELL_COMPILER = "/usr/bin/ghc" | |
|
34 | 35 | |
|
35 | 36 | C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall" |
|
36 | 37 | CPLUSPLUS_OPTIONS = "-O2 -s -std=c++11 -static -DCONTEST -lm -Wall" |
@@ -38,6 +39,7 | |||
|
38 | 39 | JAVA_OPTIONS = "" |
|
39 | 40 | PYTHON_OPTIONS = "" |
|
40 | 41 | PHP_OPTIONS = "-l" |
|
42 | + HASKELL_OPTIONS = "" | |
|
41 | 43 | |
|
42 | 44 | # Check for the correct number of arguments. Otherwise, print usage. |
|
43 | 45 | if ARGV.length == 0 or ARGV.length > 4 |
@@ -145,12 +147,13 | |||
|
145 | 147 | end |
|
146 | 148 | |
|
147 | 149 | when "python" |
|
148 | - command = "#{PYTHON_CHECKER} #{params[:source_file]}" | |
|
149 | - if system(command, out: params[:message_file]) | |
|
150 | + #command = "#{PYTHON_CHECKER} #{params[:source_file]}" | |
|
151 | + #if system(command, out: params[:message_file]) | |
|
150 | 152 | #compile to python bytecode |
|
151 | 153 | command = "#{PYTHON_INTERPRETER} -c \"import py_compile; py_compile.compile('#{params[:source_file]}','#{params[:source_file]}c');\"" |
|
152 | 154 | puts "compile: #{command}" |
|
153 | - system(command) | |
|
155 | + system(command, err: params[:message_file]) | |
|
156 | + if FileTest.exists?("#{params[:source_file]}c") | |
|
154 | 157 | puts "pwd: " + Dir.pwd |
|
155 | 158 | Dir.new('.').each {|file| puts file} |
|
156 | 159 | File.open(params[:output_file],"w") do |out_file| |
@@ -159,6 +162,7 | |||
|
159 | 162 | File.chmod(0755, params[:output_file]) |
|
160 | 163 | FileUtils.cp("#{params[:source_file]}c",params[:output_file]) |
|
161 | 164 | end |
|
165 | + #end | |
|
162 | 166 | |
|
163 | 167 | when "php" |
|
164 | 168 | command = "#{PHP_INTERPRETER} #{PHP_OPTIONS} #{params[:source_file]}" |
@@ -172,6 +176,10 | |||
|
172 | 176 | File.chmod(0755, params[:output_file]) |
|
173 | 177 | end |
|
174 | 178 | |
|
179 | + when "haskell" | |
|
180 | + command = "#{HASKELL_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{HASKELL_OPTIONS}" | |
|
181 | + system(command, err: params[:message_file]) | |
|
182 | + | |
|
175 | 183 | else |
|
176 | 184 | talk("ERROR: Invalid language specified!") |
|
177 | 185 | open(params[:message_file],"w") do |f| |
@@ -53,7 +53,7 | |||
|
53 | 53 | end |
|
54 | 54 | |
|
55 | 55 | language = ARGV[0] |
|
56 | - if language != "c" && language != "c++" && language != "pas" && language != "java" && language != "ruby" && language != "python" && language != "php" | |
|
56 | + if language != "c" && language != "c++" && language != "pas" && language != "java" && language != "ruby" && language != "python" && language != "php" && language != "haskell" | |
|
57 | 57 | log "You specified a language that is not supported: #{language}." |
|
58 | 58 | exit(127) |
|
59 | 59 | end |
@@ -140,6 +140,12 | |||
|
140 | 140 | if language == "python" then Dir["#{test_result_dir}/*.pyc"].each { |file| FileUtils.cp(file,sandbox_dir)} end |
|
141 | 141 | } |
|
142 | 142 | |
|
143 | + #additionally copy any extra .txt file | |
|
144 | + data_files = Dir[problem_home + '/*.txt'] | |
|
145 | + data_files.each do |file| | |
|
146 | + FileUtils.cp(file,sandbox_dir) | |
|
147 | + end | |
|
148 | + | |
|
143 | 149 | begin |
|
144 | 150 | execute("#{problem_home}/script/run #{language} #{test_num} ", "Error occured during execution of the run script") |
|
145 | 151 | rescue |
@@ -92,8 +92,9 | |||
|
92 | 92 | |
|
93 | 93 | JAVA_OPTION = "-s set_robust_list -s futex -s clone -s getppid -s clone -s wait4 -p /usr/bin/ -p ./" |
|
94 | 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" |
|
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/mounts -s statfs -s set_robust_list -s openat -s recvmsg -s connect -s socket -s sendto -s futex -s sigaltstack -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 | 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 | 98 | |
|
98 | 99 | case language |
|
99 | 100 | when "java" |
@@ -109,6 +110,8 | |||
|
109 | 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 | 111 | when "python" |
|
111 | 112 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{[128 * 1024,mem_limit].max} #{PYTHON_OPTION} -i #{input_file_name} -o output.txt /usr/bin/python3 #{program_name} " |
|
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} " | |
|
112 | 115 | when "php" |
|
113 | 116 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{[128 * 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} " |
|
114 | 117 | else # for c++, pascal, we do the normal checking |
You need to be logged in to leave comments.
Login now