Avoid building Julia and use the standard julia action (#83)

* Avoid building Julia and use the standard julia action
* Fix the way Julia is called in the Makefile
* Rename LICENSE -> LICENSE.md

---------

Co-authored-by: Viral B. Shah <ViralBShah@users.noreply.github.com>

Author: ViralBShah

.github/workflows/benchmarks.yml

@@ -27,7 +27,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         java-version: ['24']
-        julia-version: ['1.11.6']
+        julia-version: ['1'] # Note: use the latest Julia version
         python-version: ['3.13']
         numpy-version: ['2.3']
         gfortran-version: ['14.2']  # Note: unused since is built-in.
@@ -41,26 +41,24 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
+      - name: "Set up Julia"
+        uses: julia-actions/setup-julia@v2
+        with:
+          ref: v${{ matrix.julia-version }}
       - name: "Cache Julia"
         id: cache-julia
-        uses: actions/cache@v4
+        uses: julia-actions/cache@v2
         with:
-          path: ~/julia
           key: ${{ runner.os }}-v${{ matrix.julia-version }}
-      - name: "Build Julia"
-        if: steps.cache-julia.outputs.cache-hit != 'true'
-        uses: julia-actions/build-julia@v1
-        with:
-          ref: v${{ matrix.julia-version }}
       - name: "Set up dSFMT"
         run: |
-          cd ~/
           mkdir -p dSFMT
           cd dSFMT
-          wget https://github.com/MersenneTwister-Lab/dSFMT/archive/refs/tags/v2.2.4.tar.gz
+          wget -q https://github.com/MersenneTwister-Lab/dSFMT/archive/refs/tags/v2.2.4.tar.gz
           echo "39682961ecfba621a98dbb6610b6ae2b7d6add450d4f08d8d4edd0e10abd8174 v2.2.4.tar.gz" | sha256sum --check --status
           tar -xzf v2.2.4.tar.gz
           mv dSFMT-*/* ./
+          cd ..
       - name: "Set up OpenBLAS"
         run: |
           sudo apt-get install -y libopenblas-dev
@@ -98,6 +96,6 @@ jobs:
 #           go-version: ${{ matrix.go-version }}
       - name: "Run benchmark"
         run: |
-          JULIAHOME=~/julia DSFMTDIR=~/dSFMT/ make gh_action_benchmarks.html
+          make gh_action_benchmarks.html
       - name: "Print benchmark data"
         run: cat gh_action_benchmarks.csv

LICENSE LICENSE.mdLICENSE renamed to LICENSE.md

@@ -1,23 +1,11 @@
-ifndef JULIAHOME
-$(error JULIAHOME not defined. Set value to the root of the Julia source tree.)
-endif
-ifndef DSFMTDIR
-$(error DSFMTDIR not defined. Set value to the root of the dSFMT source tree.)
-endif
-
-
 # Will make multi-line targets work
 # (so we can use @for on the second line)
 .ONESHELL:
 
-include $(JULIAHOME)/Make.inc
-include $(JULIAHOME)/deps/*.version
-
 NODEJSBIN = node
 
 ITERATIONS=$(shell seq 1 5)
 
-#Use python2 for Python 2.x
 PYTHON = python3
 
 OCTAVE = octave-cli
@@ -39,30 +27,26 @@ endif
 FFLAGS+= -static-libgfortran
 endif
 
-#Which libm library am I using?
-LIBMDIR = $(JULIAHOME)/usr/lib/
-ifeq ($(USE_SYSTEM_LIBM), 0)
-ifeq ($(USE_SYSTEM_OPENLIBM), 0)
-LIBM = $(LIBMDIR)libopenlibm.a
-endif
-endif
-
 default: benchmarks.html
 
 export OMP_NUM_THREADS=1
-export GOTO_NUM_THREADS=1
 export OPENBLAS_NUM_THREADS=1
 
-perf.h: $(JULIAHOME)/deps/*.version
-	echo '#include "cblas.h"' > $@
-	echo '#include "$(DSFMTDIR)/dSFMT.c"' >> $@
+dsfmt:
+	mkdir -p dSFMT
+	cd dSFMT
+	wget -q https://github.com/MersenneTwister-Lab/dSFMT/archive/refs/tags/v2.2.4.tar.gz
+	echo "39682961ecfba621a98dbb6610b6ae2b7d6add450d4f08d8d4edd0e10abd8174 v2.2.4.tar.gz" | sha256sum --check --status
+	tar -xzf v2.2.4.tar.gz
+	mv dSFMT-*/* ./
+	cd ..
 
-bin/perf%: perf.c perf.h
-	$(CC) -std=c99 -O$* $< -o $@  -I$(DSFMTDIR) -lopenblas -L$(LIBMDIR) $(LIBM) $(CFLAGS) -lpthread
+bin/perf%: perf.c
+	$(CC) -std=c99 -O$* $< -o $@  -IdSFMT -lopenblas -lm $(CFLAGS) -lpthread
 
 bin/fperf%: perf.f90
 	mkdir -p mods/$@ #Modules for each binary go in separate directories
-	$(FC) $(FFLAGS) -Jmods/$@ -O$* $< -o $@ -lopenblas -L$(LIBMDIR) $(LIBM) -lpthread
+	$(FC) $(FFLAGS) -Jmods/$@ -O$* $< -o $@ -lopenblas -lm -lpthread
 
 benchmarks/c.csv: \
 	benchmarks/c0.csv \
@@ -78,7 +62,6 @@ benchmarks/fortran.csv: \
 	benchmarks/fortran3.csv
 	cat $^ > $@
 
-
 benchmarks/c%.csv: bin/perf%
 	@for t in $(ITERATIONS); do $<; done >$@
 
@@ -87,14 +70,14 @@ benchmarks/fortran%.csv: bin/fperf%
 
 benchmarks/go.csv: export GOPATH=$(abspath gopath)
 benchmarks/go.csv: perf.go
-	export CGO_LDFLAGS="-L${LIBM} -lopenblas"
+	export CGO_LDFLAGS="-lopenblas"
 	go install gonum.org/v1/netlib/blas/netlib@latest
 	go install gonum.org/v1/gonum/mat64@latest
 	go install gonum.org/v1/gonum/stat@latest
 	@for t in $(ITERATIONS); do go run $<; done >$@
 
 benchmarks/julia.csv: perf.jl
-	@for t in $(ITERATIONS); do $(JULIAHOME)/usr/bin/julia $<; done >$@
+	@for t in $(ITERATIONS); do julia $<; done >$@
 
 benchmarks/python.csv: perf.py
 	@for t in $(ITERATIONS); do $(PYTHON) $<; done >$@
@@ -150,19 +133,19 @@ gh_action_versions.csv: bin/versions.sh
 	$^ $(COLON_SEPARATED_GHA_LANGUAGES) >$@
 
 benchmarks.csv: bin/collect.jl $(BENCHMARKS)
-	@$(call PRINT_JULIA, $^ >$@)
+	julia $^ >$@
 
 gh_action_benchmarks.csv: bin/collect.jl $(GH_ACTION_BENCHMARKS)
-	@$(call PRINT_JULIA, $^ >$@)
+	julia $^ >$@
 
 benchmarks.html: bin/table.jl versions.csv benchmarks.csv
-	@$(call PRINT_JULIA, $^ >$@)
+	julia $^ >$@
 
 gh_action_benchmarks.html: bin/table.jl gh_action_versions.csv gh_action_benchmarks.csv
-	@$(call PRINT_JULIA, $^ >$@)
+	julia $^ >$@
 
 clean:
-	@rm -rf perf.h bin/perf* bin/fperf* benchmarks/*.csv benchmarks.csv mods *~ octave-core perf.log gopath/*
+	@rm -rf bin/perf* bin/fperf* benchmarks/*.csv benchmarks.csv mods *~ octave-core perf.log gopath/*
 
 .PHONY: all perf clean
 

Makefile

@@ -8,9 +8,7 @@ The results of these benchmarks are used to generate the performance graph on th
 
 ## Running benchmarks
 
-This repository assumes that Julia has been built from source and that there exists
-an environment variable `JULIAHOME` that points to the root of the Julia source tree.
-This can also be set when invoking `make`, e.g. `make JULIAHOME=path/to/julia`.
+Install Julia with `juliaup`.
 
 To build binaries and run the benchmarks, simply run `make`.
 Note that this refers to GNU Make, so BSD users will need to run `gmake`.

README.md

@@ -34,7 +34,7 @@ fi
 
 if [[ $LANGUAGES == *":julia:"* ]]; then
     echo -n "julia,"
-    $JULIAHOME/usr/bin/julia -v | cut -f3 -d" "
+    julia -v | cut -f3 -d" "
 fi
 
 if [[ $LANGUAGES == *":lua:"* ]]; then

bin/versions.sh

@@ -4,7 +4,8 @@
 
 // include header file generated by make:
 #define DSFMT_MEXP 19937
-#include "perf.h"
+#include "cblas.h"
+#include "dSFMT.c"
 #include "randmtzig.c"
 
 double *myrand(int n) {