Description:
upgrade to python3
Commit status:
[Not Reviewed]
References:
merge algo
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment

r245:f41d4a846719 - - 2 files changed: 4 inserted, 4 deleted

@@ -1,79 +1,79
1 1 #!/usr/bin/env ruby
2 2
3 3 require 'fileutils'
4 4
5 5 ##############################
6 6 #
7 7 # Standard Compile Script
8 8 #
9 9 # Supported compilers:
10 10 # gcc, g++, and fpc.
11 11 #
12 12 ##############################
13 13
14 14 def talk(str='')
15 15 if ENV['TALKATIVE']!=nil
16 16 puts str
17 17 end
18 18 if ENV['GRADER_LOGGING']!=nil
19 19 log_fname = ENV['GRADER_LOGGING']
20 20 fp = File.open(log_fname,"a")
21 21 fp.puts("run: #{Time.new.strftime("%H:%M")} #{str}")
22 22 fp.close
23 23 end
24 24 end
25 25
26 26 C_COMPILER = "/usr/bin/gcc"
27 27 CPLUSPLUS_COMPILER = "/usr/bin/g++"
28 28 PASCAL_COMPILER = "/usr/bin/fpc"
29 29 JAVA_COMPILER = "/usr/bin/javac"
30 30 RUBY_INTERPRETER = "/usr/bin/ruby"
31 - PYTHON_INTERPRETER = "/usr/bin/python"
31 + PYTHON_INTERPRETER = "/usr/bin/python3"
32 32 PYTHON_CHECKER = "/usr/bin/pyflakes"
33 33 PHP_INTERPRETER = "/usr/bin/php"
34 34
35 35 C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall"
36 36 CPLUSPLUS_OPTIONS = "-O2 -s -std=c++11 -static -DCONTEST -lm -Wall"
37 37 PASCAL_OPTIONS = "-O1 -XS -dCONTEST"
38 38 JAVA_OPTIONS = ""
39 39 PYTHON_OPTIONS = ""
40 40 PHP_OPTIONS = "-l"
41 41
42 42 # Check for the correct number of arguments. Otherwise, print usage.
43 43 if ARGV.length == 0 or ARGV.length > 4
44 44 puts "Usage: compile <language> [<source-file>] [<output-file>] [<message-file>]"
45 45 puts
46 46 puts "<source-file> is defaulted to \"source\"."
47 47 puts "<output-file> is defaulted to \"a.out\"."
48 48 puts "<message-file> is defaulted to \"compiler_message\"."
49 49 puts
50 50 exit(127)
51 51 end
52 52
53 53 PARAMS = {
54 54 :source_file => [1,'source'],
55 55 :output_file => [2,'a.out'],
56 56 :message_file => [3,'compiler_message']
57 57 }
58 58
59 59 params = {}
60 60 params[:prog_lang] = ARGV[0]
61 61 PARAMS.each_key do |param_name|
62 62 index, default = PARAMS[param_name]
63 63 if ARGV.length > index
64 64 params[param_name] = ARGV[index]
65 65 else
66 66 params[param_name] = default
67 67 end
68 68 talk "#{param_name}: #{params[param_name]}"
69 69 end
70 70
71 71 # Remove any remaining output files or message files.
72 72 if FileTest.exists? params[:output_file]
73 73 FileUtils.rm(params[:output_file])
74 74 end
75 75 if FileTest.exists? params[:message_file]
76 76 FileUtils.rm(params[:message_file])
77 77 end
78 78
79 79 # Check if the source file exists before attempt compiling.
@@ -103,86 +103,86
103 103 when "pas"
104 104 command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS}"
105 105 system(command,out: params[:message_file])
106 106 FileUtils.mv("output", params[:output_file])
107 107
108 108 when "java"
109 109 #rename the file to the public class name
110 110
111 111 #get the class name
112 112 classname = 'DUMMY'
113 113 source = Array.new
114 114 File.foreach(params[:source_file],'r:UTF-8') do |line|
115 115 line.encode!('UTF-8','UTF-8',invalid: :replace, replace: '')
116 116 md = /\s*public\s*class\s*(\w*)/.match(line)
117 117 classname=md[1] if md
118 118 source << line unless line =~ /\s*package\s*\w+\s*\;/
119 119 end
120 120 File.open("#{classname}.java","w") do |file|
121 121 source.each do |s|
122 122 file.puts s
123 123 end
124 124 end
125 125 #system("cp #{params[:source_file]} #{classname}.java")
126 126 command = "#{JAVA_COMPILER} -encoding utf8 #{classname}.java"
127 127 system(command, err: params[:message_file])
128 128 if File.exists?(classname + ".class")
129 129 File.open(params[:output_file],"w") {|file| file.write("#{classname}")}
130 130 end
131 131 if classname == 'DUMMY'
132 132 File.open(params[:message_file],"w") {|file| file.write("Cannot find any public class in the source code\n")}
133 133 end
134 134
135 135 when "ruby"
136 136 command = "#{RUBY_INTERPRETER} -c #{params[:source_file]}"
137 137 if system(command, err: params[:message_file])
138 138 File.open(params[:output_file],"w") do |out_file|
139 139 out_file.puts "#!#{RUBY_INTERPRETER}"
140 140 File.open(params[:source_file],"r").each do |line|
141 141 out_file.print line
142 142 end
143 143 end
144 144 File.chmod(0755, params[:output_file])
145 145 end
146 146
147 147 when "python"
148 148 command = "#{PYTHON_CHECKER} #{params[:source_file]}"
149 149 if system(command, out: params[:message_file])
150 150 #compile to python bytecode
151 - command = "#{PYTHON_INTERPRETER} -m py_compile #{params[:source_file]}"
151 + command = "#{PYTHON_INTERPRETER} -c \"import py_compile; py_compile.compile('#{params[:source_file]}','#{params[:source_file]}c');\""
152 152 puts "compile: #{command}"
153 153 system(command)
154 154 puts "pwd: " + Dir.pwd
155 155 Dir.new('.').each {|file| puts file}
156 156 File.open(params[:output_file],"w") do |out_file|
157 157 out_file.puts "#!#{PYTHON_INTERPRETER} #{params[:source_file]}c"
158 158 end
159 159 File.chmod(0755, params[:output_file])
160 160 FileUtils.cp("#{params[:source_file]}c",params[:output_file])
161 161 end
162 162
163 163 when "php"
164 164 command = "#{PHP_INTERPRETER} #{PHP_OPTIONS} #{params[:source_file]}"
165 165 if system(command, err: params[:message_file])
166 166 File.open(params[:output_file],"w") do |out_file|
167 167 out_file.puts "#!#{PHP_INTERPRETER}"
168 168 File.open(params[:source_file],"r").each do |line|
169 169 out_file.print line
170 170 end
171 171 end
172 172 File.chmod(0755, params[:output_file])
173 173 end
174 174
175 175 else
176 176 talk("ERROR: Invalid language specified!")
177 177 open(params[:message_file],"w") do |f|
178 178 f.puts "ERROR: Invalid language specified!"
179 179 end
180 180 exit(127)
181 181 end
182 182
183 183 # Report success or failure.
184 184 if FileTest.exists? params[:output_file]
185 185 talk "Compilation was successful!"
186 186 else
187 187 talk "ERROR: Something was wrong during the compilation!"
188 188 end
@@ -47,113 +47,113
47 47 require "#{problem_home}/script/test_dsl.rb"
48 48 load "#{problem_home}/test_cases/all_tests.cfg"
49 49 problem = Problem.get_instance
50 50
51 51 sandbox_dir = Dir.getwd
52 52
53 53 if problem.well_formed? == false
54 54 log "The problem specification is not well formed."
55 55 exit(127)
56 56 end
57 57
58 58 # Check if the test number is okay.
59 59 if test_num <= 0 || test_num > problem.num_tests
60 60 log "You have specified a wrong test number."
61 61 exit(127)
62 62 end
63 63
64 64 #####################################
65 65 # Set the relavant file names here. #
66 66 #####################################
67 67
68 68 input_file_name = "#{problem_home}/test_cases/#{test_num}/input-#{test_num}.txt"
69 69
70 70 #####################################
71 71
72 72 time_limit = problem.get_time_limit test_num
73 73 mem_limit = problem.get_mem_limit(test_num) * 1024
74 74
75 75 # Copy the input file.
76 76 #`cp #{problem_home}/test_cases/#{test_num}/#{input_file_name} .`
77 77
78 78 # check if box is there, if not, compile it!
79 79 if !File.exists?("#{problem_home}/script/box")
80 80 log "WARNING: Compiling box: to increase efficiency, it should be compile manually"
81 81 compile_box("#{problem_home}/script/box.cc",
82 82 "#{problem_home}/script/box")
83 83 end
84 84
85 85 # Hide PROBLEM_HOME
86 86 ENV['PROBLEM_HOME'] = nil
87 87 ENV['SOURCE_NAME'] = nil
88 88
89 89 # Run the program.
90 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 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 #{sandbox_dir}/#{program_name} -p ./#{program_name} -p #{sandbox_dir}/#{source_name} -s set_robust_list -s openat -s recvmsg -s connect -s socket -s sendto -s futex -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} -s set_robust_list -s openat -s recvmsg -s connect -s socket -s sendto -s futex -s sigaltstack -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 97
98 98 case language
99 99 when "java"
100 100 # for java, extract the classname
101 101 # wne have to add additional systemcall and we don't check the mem limit (dunno how to fix...)
102 102 classname = 'DUMMY'
103 103 File.open(program_name,"r").each do |line|
104 104 classname = line
105 105 end
106 106 #for java, we cannot really check the memory limit...
107 107 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 108 when "ruby"
109 109 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 110 when "python"
111 - run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{PYTHON_OPTION} -i #{input_file_name} -o output.txt /usr/bin/python #{program_name} "
111 + run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{PYTHON_OPTION} -i #{input_file_name} -o output.txt /usr/bin/python3 #{program_name} "
112 112 when "php"
113 113 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 114 else # for c++, pascal, we do the normal checking
115 115 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} "
116 116 end
117 117
118 118
119 119 log "Running test #{test_num}..."
120 120 log run_command
121 121 log
122 122 system(run_command,err: 'run_result')
123 123
124 124 # Restore PROBLEM_HOME
125 125 ENV['PROBLEM_HOME'] = problem_home
126 126
127 127 # Create the result file.
128 128 result_file = File.new("result", "w")
129 129 comment_file = File.new("comment", "w")
130 130
131 131 # Check if the program actually produced any output.
132 132 run_result_file = File.new("run_result", "r")
133 133 run_result = run_result_file.readlines
134 134 run_result_file.close
135 135
136 136 run_stat = run_result[run_result.length-1]
137 137 running_time = extract_time(run_stat)
138 138
139 139 report = lambda{ |status, points, comment|
140 140 result_file.write status.strip
141 141 result_file.write "\n"
142 142 result_file.write points.to_s.strip
143 143 result_file.write "\n"
144 144 result_file.write run_stat.strip
145 145 result_file.write "\n"
146 146 result_file.close
147 147 FileUtils.rm "run_result"
148 148 # `rm output.txt` --- keep the output
149 149
150 150 comment_file.write comment
151 151
152 152 # added for debuggin --- jittat
153 153 comment_file.write "--run-result--\n"
154 154 run_result.each do |l|
155 155 comment_file.write l
156 156 end
157 157
158 158 comment_file.close
159 159
You need to be logged in to leave comments. Login now