cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r247:47c98faa5421` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r247:47c98faa5421 - Tue, 28 Feb 2017 08:39:31 - 9 files changed: 134 inserted, 8 deleted

grader-process-check created 755 ¶ +6

@@ -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

load_testcase created 755 ¶ +85

@@ -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	+

import_problem ¶ +6

                   end
                 end
+            +   #also include any .txt files
+            +   Dir.glob("#{testcase_dir}/*.txt") do |file|
+            +     puts "copy data file #{file}"
+            +     FileUtils.cp(file,"#{problem_dir}")
+            +   end
+            +
                 # generating all_tests.cfg
                 puts "generating testcase config file"

installer/install.sh ¶ +1 -1

                 sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev \
                 ncurses-dev automake libtool bison subversion \
                 pkg-config curl nodejs unzip pyflakes ruby default-jdk \
-            -   libmysqld-dev mercurial python-setuptools python-dev
+            +   libmysqld-dev mercurial python-setuptools python-dev python3-numpy
               echo "Installing RVM"
               curl -k -L https://get.rvm.io | bash -s stable

rename_problem ¶ +2 -2

               def rename_problem(old_problem_name, new_problem_name)
-            -   if valid_problem_name(new_problem_name)
+            +   unless valid_problem_name(new_problem_name)
                   puts "Bad new problem name: #{new_problem_name}"
                   return
                 end
                 if name.length==0:
                     return false
                 else
-            -     return !(/^[a-zA-Z0-9_\-]+$/ === name)
+            +     return (/^[a-zA-Z0-9_\-]+$/ === name)
                 end
               end

std-script/box64-new.c ¶ +12

@@ -603,6 +603,18
603	/* 311 */ [ __NR_process_vm_writev ] = "process_vm_writev",	603	/* 311 */ [ __NR_process_vm_writev ] = "process_vm_writev",
604	/* 312 */ [ __NR_kcmp ] = "kcmp",	604	/* 312 */ [ __NR_kcmp ] = "kcmp",
605	/* 313 */ [ __NR_finit_module ] = "finit_module",	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	#define NUM_SYSCALLS ARRAY_SIZE(syscall_names)	619	#define NUM_SYSCALLS ARRAY_SIZE(syscall_names)
608	#define NUM_ACTIONS (NUM_SYSCALLS+64)	620	#define NUM_ACTIONS (NUM_SYSCALLS+64)

std-script/compile ¶ +11 -3

               PYTHON_INTERPRETER = "/usr/bin/python3"
               PYTHON_CHECKER = "/usr/bin/pyflakes"
               PHP_INTERPRETER = "/usr/bin/php"
+            + HASKELL_COMPILER = "/usr/bin/ghc"
               C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall"
               CPLUSPLUS_OPTIONS = "-O2 -s -std=c++11 -static -DCONTEST -lm -Wall"
               JAVA_OPTIONS = ""
               PYTHON_OPTIONS = ""
               PHP_OPTIONS = "-l"
+            + HASKELL_OPTIONS = ""
               # Check for the correct number of arguments. Otherwise, print usage.
               if ARGV.length == 0 or ARGV.length > 4
                 end
               when "python"
-            -   command = "#{PYTHON_CHECKER} #{params[:source_file]}"
+            +   #command = "#{PYTHON_CHECKER} #{params[:source_file]}"
-            -   if system(command, out: params[:message_file])
+            +   #if system(command, out: params[:message_file])
                   #compile to python bytecode
                   command = "#{PYTHON_INTERPRETER} -c \"import py_compile; py_compile.compile('#{params[:source_file]}','#{params[:source_file]}c');\""
                   puts "compile: #{command}"
-            -     system(command)
+            +     system(command, err: params[:message_file])
+            +     if FileTest.exists?("#{params[:source_file]}c")
                     puts "pwd: " + Dir.pwd
                     Dir.new('.').each {|file| puts file}
                     File.open(params[:output_file],"w") do |out_file|
                     File.chmod(0755, params[:output_file])
                     FileUtils.cp("#{params[:source_file]}c",params[:output_file])
                   end
+            +   #end
               when "php"
                 command = "#{PHP_INTERPRETER} #{PHP_OPTIONS} #{params[:source_file]}"
                   File.chmod(0755, params[:output_file])
                 end
+            + when "haskell"
+            +   command = "#{HASKELL_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{HASKELL_OPTIONS}"
+            +   system(command, err: params[:message_file])
+            +
               else
                 talk("ERROR: Invalid language specified!")
                 open(params[:message_file],"w") do |f|

std-script/judge ¶ +7 -1

               end
               language = ARGV[0]
-            - if language != "c" && language != "c++" && language != "pas" && language != "java" && language != "ruby" && language != "python" && language != "php"
+            + if language != "c" && language != "c++" && language != "pas" && language != "java" && language != "ruby" && language != "python" && language != "php" && language != "haskell"
                 log "You specified a language that is not supported: #{language}."
                 exit(127)
               end
                   if language == "python" then Dir["#{test_result_dir}/*.pyc"].each { |file| FileUtils.cp(file,sandbox_dir)} end
                 }
+            +   #additionally copy any extra .txt file
+            +   data_files = Dir[problem_home + '/*.txt']
+            +   data_files.each do |file|
+            +     FileUtils.cp(file,sandbox_dir)
+            +   end
+            +
                 begin
                   execute("#{problem_home}/script/run #{language} #{test_num} ", "Error occured during execution of the run script")
                 rescue

std-script/run ¶ +4 -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"
-            - 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"
+            + 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"
               case language
                 when "java"
                   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} "
                 when "python"
                   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} "
+            +   when "haskell"
+            +     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} "
                 when "php"
                   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} "
                 else # for c++, pascal, we do the normal checking

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

r247:47c98faa5421 - Tue, 28 Feb 2017 08:39:31 - 9 files changed: 134 inserted, 8 deleted

Sign in to your account

Commit r247:47c98faa5421 public

Author

r247:47c98faa5421 - Tue, 28 Feb 2017 08:39:31 - 9 files changed: 134 inserted, 8 deleted

Commit `r247:47c98faa5421` public