Merge upstream V fixes (#983)

* Use latest Julia version to represent current performance (#972) * Use latest Julia version to represent current performance * Use latest stable 1.X version * Add timeout to benchmark solution runs (#977) * Added formatting and removed deprecated attributes syntax (#982) Co-authored-by: Tudor Marghidanu <[email protected]> --------- Co-authored-by: Christian Guinard <[email protected]> Co-authored-by: Tudor Marghidanu <[email protected]> Co-authored-by: Tudor Marghidanu <[email protected]>
PlummersSoftwareLLC · Oct 20, 2024 · 011f09d · 011f09d
1 parent 304c9ab
commit 011f09d
Show file tree

Hide file tree

Showing 11 changed files with 998 additions and 956 deletions.
diff --git a/BENCHMARK.md b/BENCHMARK.md
@@ -22,6 +22,7 @@ Some solutions are not included in the automated benchmark runs, either because
 - [Running a benchmark of all solutions for a particular language](#running-a-benchmark-of-all-solutions-for-a-particular-language)
 - [Running in unconfined mode](#running-in-unconfined-mode)
 - [Output formats](#output-formats)
+- [Setting the solution timeout](#setting-the-solution-timeout)
 
 ## What operating system to use?
 
@@ -375,3 +376,13 @@ The output format can be controlled via the `FORMATTER` variable like this:
 make FORMATTER=json
 make DIRECTORY=PrimeCrystal/solution_1 FORMATTER=csv
 ```
+
+## Setting the solution timeout
+
+The run of each solution is limited to a certain duration, which is 10 minutes by default.
+You can change this setting through the `TIMEOUT` variable like this:
+
+```shell
+make TIMEOUT=15
+make DIRECTORY=PrimeCPP/solution_2 TIMEOUT=15
+```
diff --git a/Makefile b/Makefile
@@ -4,6 +4,7 @@ SHELL := /bin/bash
 
 DIRECTORY := $(shell pwd)
 FORMATTER := "table"
+TIMEOUT := "10"
 
 .PHONY: all
 all: benchmark
@@ -14,6 +15,7 @@ benchmark: check-env
 	ARGS=("-d $${REALPATH}" "-f $(FORMATTER)"); \
 	[ ! -z $${OUTPUT_FILE} ] && ARGS+=( "-o $${OUTPUT_FILE}" ); \
 	[ ! -z $${UNCONFINED} ] && ARGS+=( "--unconfined" ); \
+	[ ! -z $${TIMEOUT} ] && ARGS+=( "-t $${TIMEOUT}" ); \
 	cd ./tools; npm ci --silent && npm start --silent -- benchmark $${ARGS[@]}
 
 .PHONY: check-env

diff --git a/PrimeJulia/solution_1/Dockerfile b/PrimeJulia/solution_1/Dockerfile
@@ -1,4 +1,4 @@
-FROM julia:1.6-alpine3.13
+FROM julia:1-alpine
 
 WORKDIR /opt/app
 

diff --git a/PrimeJulia/solution_2/Dockerfile b/PrimeJulia/solution_2/Dockerfile
@@ -1,4 +1,4 @@
-FROM julia:1.6.1-alpine3.13
+FROM julia:1-alpine
 
 WORKDIR /opt/app
 

diff --git a/PrimeJulia/solution_3/Dockerfile b/PrimeJulia/solution_3/Dockerfile
@@ -1,4 +1,4 @@
-FROM julia:1.6-buster
+FROM julia:1
 
 WORKDIR /opt/app
 

diff --git a/PrimeJulia/solution_3/README.md b/PrimeJulia/solution_3/README.md
@@ -10,7 +10,7 @@ optimizations. This is a sort-of "low-level" style implementation in
 Julia to get as much as speed as possible out of the language. It is
 *not* designed to be idiomatic Julia code.
 
-This solution requires at least **Julia 1.5** to run. Julia 1.6 is
+This solution requires at least **Julia 1.5** to run. the latest stable 1.X Julia version is
 recommended and is used in the Docker image.
 
 ## Description
@@ -40,7 +40,7 @@ and bits are unset when the number is *prime*. This simplifies the
 set_bit operation slightly (`arr[i] |= mask vs. arr[i] &= ~mask`).
 
 If you see any room for improvement in the code or have any
-suggestions, don't hesitate to open an issue, pull request (PR), 
+suggestions, don't hesitate to open an issue, pull request (PR),
 Discussion, or the like. Don't forget to tag me at `@louie-github` so I
 can be notified if my personal input is either wanted or needed.
 I'm open to fixing stylistic issues or discussing cosmetic changes to

diff --git a/PrimeJulia/solution_4/Dockerfile b/PrimeJulia/solution_4/Dockerfile
@@ -1,4 +1,4 @@
-FROM julia:1.6-buster
+FROM julia:1
 
 WORKDIR /opt/app
 

diff --git a/PrimeV/solution_1/primes.v b/PrimeV/solution_1/primes.v
@@ -1,31 +1,29 @@
 import time
 import math
 
-const (
-	sieve_size          = 1_000_000
-	q                   = math.sqrt(sieve_size)
-	all_bits_true_array = []bool{len: sieve_size, init: true}
-	dictionary          = {
-		'10':          4
-		'100':         25
-		'1000':        168
-		'10000':       1229
-		'100000':      9592
-		'1000000':     78498
-		'10000000':    664579
-		'100000000':   5761455
-		'1000000000':  50847534
-		'10000000000': 455052511
-	}
-)
+const sieve_size = 1_000_000
+const q = math.sqrt(sieve_size)
+const all_bits_true_array = []bool{len: sieve_size, init: true}
+const dictionary = {
+	'10':          4
+	'100':         25
+	'1000':        168
+	'10000':       1229
+	'100000':      9592
+	'1000000':     78498
+	'10000000':    664579
+	'100000000':   5761455
+	'1000000000':  50847534
+	'10000000000': 455052511
+}
 
 struct Sieve {
 	sieve_size u64
 mut:
 	bits []bool
 }
 
-[direct_array_access]
+@[direct_array_access]
 fn (mut sieve Sieve) run_sieve() {
 	mut factor := u64(3)
 
@@ -54,7 +52,7 @@ fn (sieve Sieve) print_results(show_results bool, duration time.Duration, passes
 	for num := u64(3); num <= sieve.sieve_size; num += u64(2) {
 		if sieve.bits[num] {
 			if show_results {
-				print('$num, ')
+				print('${num}, ')
 			}
 
 			count++
@@ -68,9 +66,9 @@ fn (sieve Sieve) print_results(show_results bool, duration time.Duration, passes
 	avg := f64(duration / passes)
 	count_primes := sieve.count_primes()
 	valid := (count_primes == u64(dictionary[sieve.sieve_size.str()]))
-	eprintln('Passes: $passes, Time: $duration, Avg: $avg, Limit: $sieve.sieve_size, Count1: $count, Count2: $count_primes, Valid: $valid')
+	eprintln('Passes: ${passes}, Time: ${duration}, Avg: ${avg}, Limit: ${sieve.sieve_size}, Count1: ${count}, Count2: ${count_primes}, Valid: ${valid}')
 
-	println('marghidanu;$passes;$duration;1;algorithm=base,faithful=yes')
+	println('marghidanu;${passes};${duration};1;algorithm=base,faithful=yes')
 }
 
 fn (sieve Sieve) count_primes() u64 {
@@ -92,7 +90,7 @@ fn main() {
 	for {
 		mut sieve := Sieve{
 			sieve_size: 1_000_000
-			bits: all_bits_true_array
+			bits:       all_bits_true_array
 		}
 		sieve.run_sieve()