diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 7abe7d680..1eb03c97e 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,5 +1,5 @@ env: - JULIA_VERSION: "1.9.3" + JULIA_VERSION: "1.10.0" SLURM_CPUS_PER_TASK: 1 OPENMPI_VERSION: "4.0.4" CUDA_VERSION: "11.2" diff --git a/.github/workflows/CodeCov.yml b/.github/workflows/CodeCov.yml index 0e233e541..ef5f75b05 100644 --- a/.github/workflows/CodeCov.yml +++ b/.github/workflows/CodeCov.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Julia uses: julia-actions/setup-julia@latest with: - version: 1.9.3 + version: 1.10.0 - name: Test with coverage env: diff --git a/.github/workflows/JuliaFormatter.yml b/.github/workflows/JuliaFormatter.yml index ae159d8ed..ee96cc38f 100644 --- a/.github/workflows/JuliaFormatter.yml +++ b/.github/workflows/JuliaFormatter.yml @@ -27,7 +27,7 @@ jobs: - uses: julia-actions/setup-julia@latest if: steps.filter.outputs.julia_file_change == 'true' with: - version: 1.9.3 + version: 1.10.0 - name: Apply JuliaFormatter if: steps.filter.outputs.julia_file_change == 'true' diff --git a/.github/workflows/UpDeps.yml b/.github/workflows/UpDeps.yml index 4b5ae2dc4..1aab0a2af 100644 --- a/.github/workflows/UpDeps.yml +++ b/.github/workflows/UpDeps.yml @@ -19,7 +19,7 @@ jobs: - uses: julia-actions/setup-julia@latest with: - version: 1.9.3 + version: 1.10.0 - name: Apply UpDeps run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 118c13f54..4fa61adcc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: version: - - '1.9.3' + - '1.10.0' os: - ubuntu-latest - macOS-latest diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b879b3df2..df2c02b5a 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@latest with: - version: 1.9.3 + version: 1.10.0 - name: Install dependencies run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()' - name: Build and deploy diff --git a/experiments/SCT1_benchmark/global_parallel/ekp_par_calibration.sbatch b/experiments/SCT1_benchmark/global_parallel/ekp_par_calibration.sbatch index 148aa1050..94eb4dbef 100644 --- a/experiments/SCT1_benchmark/global_parallel/ekp_par_calibration.sbatch +++ b/experiments/SCT1_benchmark/global_parallel/ekp_par_calibration.sbatch @@ -19,7 +19,7 @@ n_proc_scm=10 echo "Initializing calibration with ${n} ensemble members and ${n_it} iterations." module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 export JULIA_NUM_THREADS=${SLURM_CPUS_PER_TASK:=1} export JULIA_MPI_BINARY=system diff --git a/experiments/SCT1_benchmark/global_parallel/init.sbatch b/experiments/SCT1_benchmark/global_parallel/init.sbatch index b9d517fc1..9f8dcc2d4 100644 --- a/experiments/SCT1_benchmark/global_parallel/init.sbatch +++ b/experiments/SCT1_benchmark/global_parallel/init.sbatch @@ -7,7 +7,7 @@ #SBATCH -J "sct_init" # job name #julia package management -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 config=${1?Error: no config file given} job_id=${2?Error: no job ID given} diff --git a/experiments/SCT1_benchmark/global_parallel/parallel_scm_eval.sbatch b/experiments/SCT1_benchmark/global_parallel/parallel_scm_eval.sbatch index 5785b02ba..2dad1cd28 100644 --- a/experiments/SCT1_benchmark/global_parallel/parallel_scm_eval.sbatch +++ b/experiments/SCT1_benchmark/global_parallel/parallel_scm_eval.sbatch @@ -5,7 +5,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "sct_run" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} n_proc_scm=${3?Error: number of processes not given} diff --git a/experiments/SCT1_benchmark/global_parallel/precondition_prior.sbatch b/experiments/SCT1_benchmark/global_parallel/precondition_prior.sbatch index 938bae0d9..5c1b4d37f 100644 --- a/experiments/SCT1_benchmark/global_parallel/precondition_prior.sbatch +++ b/experiments/SCT1_benchmark/global_parallel/precondition_prior.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "precond" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} diff --git a/experiments/SCT1_benchmark/global_parallel/restart.sbatch b/experiments/SCT1_benchmark/global_parallel/restart.sbatch index b2a5f1ef0..b0dbca874 100644 --- a/experiments/SCT1_benchmark/global_parallel/restart.sbatch +++ b/experiments/SCT1_benchmark/global_parallel/restart.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "restart" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 output_dir=${1?Error: no output directory given} job_id=${2?Error: no job ID given} diff --git a/experiments/SCT1_benchmark/global_parallel/restart_ekp_par_calibration.sbatch b/experiments/SCT1_benchmark/global_parallel/restart_ekp_par_calibration.sbatch index bfe2c5e57..da968b020 100644 --- a/experiments/SCT1_benchmark/global_parallel/restart_ekp_par_calibration.sbatch +++ b/experiments/SCT1_benchmark/global_parallel/restart_ekp_par_calibration.sbatch @@ -26,7 +26,7 @@ n_proc_scm=10 echo "Restarting calibration with ${n} ensemble members and ${n_it} iterations (grand total)." module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 export JULIA_NUM_THREADS=${SLURM_CPUS_PER_TASK:=1} export JULIA_MPI_BINARY=system diff --git a/experiments/SCT1_benchmark/global_parallel/step_ekp.sbatch b/experiments/SCT1_benchmark/global_parallel/step_ekp.sbatch index 65d08b846..db3d0b5cd 100644 --- a/experiments/SCT1_benchmark/global_parallel/step_ekp.sbatch +++ b/experiments/SCT1_benchmark/global_parallel/step_ekp.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "sct_cont" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} job_dir=$(head $job_id".txt" | tail -1) diff --git a/experiments/SCT1_benchmark/global_parallel/sysimage.sbatch b/experiments/SCT1_benchmark/global_parallel/sysimage.sbatch index 8eba44b0f..2aace9bbb 100644 --- a/experiments/SCT1_benchmark/global_parallel/sysimage.sbatch +++ b/experiments/SCT1_benchmark/global_parallel/sysimage.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=20G # memory per CPU core #SBATCH -J "sys_im" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project -C skylake-avx512 create_tc_so.jl diff --git a/experiments/SCT2_benchmark/global_parallel/ekp_par_calibration.sbatch b/experiments/SCT2_benchmark/global_parallel/ekp_par_calibration.sbatch index 148aa1050..94eb4dbef 100644 --- a/experiments/SCT2_benchmark/global_parallel/ekp_par_calibration.sbatch +++ b/experiments/SCT2_benchmark/global_parallel/ekp_par_calibration.sbatch @@ -19,7 +19,7 @@ n_proc_scm=10 echo "Initializing calibration with ${n} ensemble members and ${n_it} iterations." module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 export JULIA_NUM_THREADS=${SLURM_CPUS_PER_TASK:=1} export JULIA_MPI_BINARY=system diff --git a/experiments/SCT2_benchmark/global_parallel/init.sbatch b/experiments/SCT2_benchmark/global_parallel/init.sbatch index b9d517fc1..9f8dcc2d4 100644 --- a/experiments/SCT2_benchmark/global_parallel/init.sbatch +++ b/experiments/SCT2_benchmark/global_parallel/init.sbatch @@ -7,7 +7,7 @@ #SBATCH -J "sct_init" # job name #julia package management -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 config=${1?Error: no config file given} job_id=${2?Error: no job ID given} diff --git a/experiments/SCT2_benchmark/global_parallel/parallel_scm_eval.sbatch b/experiments/SCT2_benchmark/global_parallel/parallel_scm_eval.sbatch index 5785b02ba..2dad1cd28 100644 --- a/experiments/SCT2_benchmark/global_parallel/parallel_scm_eval.sbatch +++ b/experiments/SCT2_benchmark/global_parallel/parallel_scm_eval.sbatch @@ -5,7 +5,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "sct_run" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} n_proc_scm=${3?Error: number of processes not given} diff --git a/experiments/SCT2_benchmark/global_parallel/precondition_prior.sbatch b/experiments/SCT2_benchmark/global_parallel/precondition_prior.sbatch index 938bae0d9..5c1b4d37f 100644 --- a/experiments/SCT2_benchmark/global_parallel/precondition_prior.sbatch +++ b/experiments/SCT2_benchmark/global_parallel/precondition_prior.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "precond" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} diff --git a/experiments/SCT2_benchmark/global_parallel/restart.sbatch b/experiments/SCT2_benchmark/global_parallel/restart.sbatch index b2a5f1ef0..b0dbca874 100644 --- a/experiments/SCT2_benchmark/global_parallel/restart.sbatch +++ b/experiments/SCT2_benchmark/global_parallel/restart.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "restart" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 output_dir=${1?Error: no output directory given} job_id=${2?Error: no job ID given} diff --git a/experiments/SCT2_benchmark/global_parallel/restart_ekp_par_calibration.sbatch b/experiments/SCT2_benchmark/global_parallel/restart_ekp_par_calibration.sbatch index bfe2c5e57..da968b020 100644 --- a/experiments/SCT2_benchmark/global_parallel/restart_ekp_par_calibration.sbatch +++ b/experiments/SCT2_benchmark/global_parallel/restart_ekp_par_calibration.sbatch @@ -26,7 +26,7 @@ n_proc_scm=10 echo "Restarting calibration with ${n} ensemble members and ${n_it} iterations (grand total)." module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 export JULIA_NUM_THREADS=${SLURM_CPUS_PER_TASK:=1} export JULIA_MPI_BINARY=system diff --git a/experiments/SCT2_benchmark/global_parallel/step_ekp.sbatch b/experiments/SCT2_benchmark/global_parallel/step_ekp.sbatch index 65d08b846..db3d0b5cd 100644 --- a/experiments/SCT2_benchmark/global_parallel/step_ekp.sbatch +++ b/experiments/SCT2_benchmark/global_parallel/step_ekp.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "sct_cont" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} job_dir=$(head $job_id".txt" | tail -1) diff --git a/experiments/SCT2_benchmark/global_parallel/sysimage.sbatch b/experiments/SCT2_benchmark/global_parallel/sysimage.sbatch index 8eba44b0f..2aace9bbb 100644 --- a/experiments/SCT2_benchmark/global_parallel/sysimage.sbatch +++ b/experiments/SCT2_benchmark/global_parallel/sysimage.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=20G # memory per CPU core #SBATCH -J "sys_im" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project -C skylake-avx512 create_tc_so.jl diff --git a/experiments/SCT3_benchmark/global_parallel/ekp_par_calibration.sbatch b/experiments/SCT3_benchmark/global_parallel/ekp_par_calibration.sbatch index 148aa1050..94eb4dbef 100644 --- a/experiments/SCT3_benchmark/global_parallel/ekp_par_calibration.sbatch +++ b/experiments/SCT3_benchmark/global_parallel/ekp_par_calibration.sbatch @@ -19,7 +19,7 @@ n_proc_scm=10 echo "Initializing calibration with ${n} ensemble members and ${n_it} iterations." module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 export JULIA_NUM_THREADS=${SLURM_CPUS_PER_TASK:=1} export JULIA_MPI_BINARY=system diff --git a/experiments/SCT3_benchmark/global_parallel/init.sbatch b/experiments/SCT3_benchmark/global_parallel/init.sbatch index e61e052cc..a6a50d034 100644 --- a/experiments/SCT3_benchmark/global_parallel/init.sbatch +++ b/experiments/SCT3_benchmark/global_parallel/init.sbatch @@ -7,7 +7,7 @@ #SBATCH -J "sct_init" # job name #julia package management -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 config=${1?Error: no config file given} job_id=${2?Error: no job ID given} diff --git a/experiments/SCT3_benchmark/global_parallel/parallel_scm_eval.sbatch b/experiments/SCT3_benchmark/global_parallel/parallel_scm_eval.sbatch index debf98007..89c009779 100644 --- a/experiments/SCT3_benchmark/global_parallel/parallel_scm_eval.sbatch +++ b/experiments/SCT3_benchmark/global_parallel/parallel_scm_eval.sbatch @@ -5,7 +5,7 @@ #SBATCH --mem-per-cpu=10G # memory per CPU core #SBATCH -J "sct_run" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} n_proc_scm=${3?Error: number of processes not given} diff --git a/experiments/SCT3_benchmark/global_parallel/precondition_prior.sbatch b/experiments/SCT3_benchmark/global_parallel/precondition_prior.sbatch index 938bae0d9..5c1b4d37f 100644 --- a/experiments/SCT3_benchmark/global_parallel/precondition_prior.sbatch +++ b/experiments/SCT3_benchmark/global_parallel/precondition_prior.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "precond" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} diff --git a/experiments/SCT3_benchmark/global_parallel/restart.sbatch b/experiments/SCT3_benchmark/global_parallel/restart.sbatch index b2a5f1ef0..b0dbca874 100644 --- a/experiments/SCT3_benchmark/global_parallel/restart.sbatch +++ b/experiments/SCT3_benchmark/global_parallel/restart.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "restart" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 output_dir=${1?Error: no output directory given} job_id=${2?Error: no job ID given} diff --git a/experiments/SCT3_benchmark/global_parallel/restart_ekp_par_calibration.sbatch b/experiments/SCT3_benchmark/global_parallel/restart_ekp_par_calibration.sbatch index bfe2c5e57..da968b020 100644 --- a/experiments/SCT3_benchmark/global_parallel/restart_ekp_par_calibration.sbatch +++ b/experiments/SCT3_benchmark/global_parallel/restart_ekp_par_calibration.sbatch @@ -26,7 +26,7 @@ n_proc_scm=10 echo "Restarting calibration with ${n} ensemble members and ${n_it} iterations (grand total)." module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 export JULIA_NUM_THREADS=${SLURM_CPUS_PER_TASK:=1} export JULIA_MPI_BINARY=system diff --git a/experiments/SCT3_benchmark/global_parallel/step_ekp.sbatch b/experiments/SCT3_benchmark/global_parallel/step_ekp.sbatch index 65d08b846..db3d0b5cd 100644 --- a/experiments/SCT3_benchmark/global_parallel/step_ekp.sbatch +++ b/experiments/SCT3_benchmark/global_parallel/step_ekp.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "sct_cont" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} job_dir=$(head $job_id".txt" | tail -1) diff --git a/experiments/SCT3_benchmark/global_parallel/sysimage.sbatch b/experiments/SCT3_benchmark/global_parallel/sysimage.sbatch index 8eba44b0f..2aace9bbb 100644 --- a/experiments/SCT3_benchmark/global_parallel/sysimage.sbatch +++ b/experiments/SCT3_benchmark/global_parallel/sysimage.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=20G # memory per CPU core #SBATCH -J "sys_im" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project -C skylake-avx512 create_tc_so.jl diff --git a/experiments/grid_search/restart_grid_search.sbatch b/experiments/grid_search/restart_grid_search.sbatch index d42137f18..4850c990b 100644 --- a/experiments/grid_search/restart_grid_search.sbatch +++ b/experiments/grid_search/restart_grid_search.sbatch @@ -11,6 +11,6 @@ outdir=${1?Error: no output directory given} module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project -e 'using Pkg; Pkg.instantiate(); Pkg.API.precompile()' julia --project -p 25 grid_search.jl --outdir $outdir --mode restart diff --git a/experiments/grid_search/run_grid_search.sbatch b/experiments/grid_search/run_grid_search.sbatch index e580e979b..9b07d3ac4 100644 --- a/experiments/grid_search/run_grid_search.sbatch +++ b/experiments/grid_search/run_grid_search.sbatch @@ -11,6 +11,6 @@ config=${1?Error: no config file given} module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project -e 'using Pkg; Pkg.instantiate(); Pkg.API.precompile()' julia --project -p 25 grid_search.jl --config $config --mode new diff --git a/experiments/grid_search/run_loss_map.sbatch b/experiments/grid_search/run_loss_map.sbatch index 00f4469f5..dc667aef0 100644 --- a/experiments/grid_search/run_loss_map.sbatch +++ b/experiments/grid_search/run_loss_map.sbatch @@ -11,6 +11,6 @@ sim_dir=${1?Error: no simulation path given} module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project -e 'using Pkg; Pkg.instantiate(); Pkg.API.precompile()' julia --project -p 25 loss_map.jl --sim_dir $sim_dir diff --git a/experiments/les_strats/global_parallel/ekp_par_calibration.sbatch b/experiments/les_strats/global_parallel/ekp_par_calibration.sbatch index 148aa1050..94eb4dbef 100644 --- a/experiments/les_strats/global_parallel/ekp_par_calibration.sbatch +++ b/experiments/les_strats/global_parallel/ekp_par_calibration.sbatch @@ -19,7 +19,7 @@ n_proc_scm=10 echo "Initializing calibration with ${n} ensemble members and ${n_it} iterations." module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 export JULIA_NUM_THREADS=${SLURM_CPUS_PER_TASK:=1} export JULIA_MPI_BINARY=system diff --git a/experiments/les_strats/global_parallel/init.sbatch b/experiments/les_strats/global_parallel/init.sbatch index b9d517fc1..9f8dcc2d4 100644 --- a/experiments/les_strats/global_parallel/init.sbatch +++ b/experiments/les_strats/global_parallel/init.sbatch @@ -7,7 +7,7 @@ #SBATCH -J "sct_init" # job name #julia package management -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 config=${1?Error: no config file given} job_id=${2?Error: no job ID given} diff --git a/experiments/les_strats/global_parallel/parallel_scm_eval.sbatch b/experiments/les_strats/global_parallel/parallel_scm_eval.sbatch index 5785b02ba..2dad1cd28 100644 --- a/experiments/les_strats/global_parallel/parallel_scm_eval.sbatch +++ b/experiments/les_strats/global_parallel/parallel_scm_eval.sbatch @@ -5,7 +5,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "sct_run" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} n_proc_scm=${3?Error: number of processes not given} diff --git a/experiments/les_strats/global_parallel/precondition_prior.sbatch b/experiments/les_strats/global_parallel/precondition_prior.sbatch index 938bae0d9..5c1b4d37f 100644 --- a/experiments/les_strats/global_parallel/precondition_prior.sbatch +++ b/experiments/les_strats/global_parallel/precondition_prior.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "precond" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} diff --git a/experiments/les_strats/global_parallel/restart.sbatch b/experiments/les_strats/global_parallel/restart.sbatch index b2a5f1ef0..b0dbca874 100644 --- a/experiments/les_strats/global_parallel/restart.sbatch +++ b/experiments/les_strats/global_parallel/restart.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "restart" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 output_dir=${1?Error: no output directory given} job_id=${2?Error: no job ID given} diff --git a/experiments/les_strats/global_parallel/restart_ekp_par_calibration.sbatch b/experiments/les_strats/global_parallel/restart_ekp_par_calibration.sbatch index bfe2c5e57..da968b020 100644 --- a/experiments/les_strats/global_parallel/restart_ekp_par_calibration.sbatch +++ b/experiments/les_strats/global_parallel/restart_ekp_par_calibration.sbatch @@ -26,7 +26,7 @@ n_proc_scm=10 echo "Restarting calibration with ${n} ensemble members and ${n_it} iterations (grand total)." module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 export JULIA_NUM_THREADS=${SLURM_CPUS_PER_TASK:=1} export JULIA_MPI_BINARY=system diff --git a/experiments/les_strats/global_parallel/step_ekp.sbatch b/experiments/les_strats/global_parallel/step_ekp.sbatch index 65d08b846..db3d0b5cd 100644 --- a/experiments/les_strats/global_parallel/step_ekp.sbatch +++ b/experiments/les_strats/global_parallel/step_ekp.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "sct_cont" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} job_dir=$(head $job_id".txt" | tail -1) diff --git a/experiments/les_strats/global_parallel/sysimage.sbatch b/experiments/les_strats/global_parallel/sysimage.sbatch index 8eba44b0f..2aace9bbb 100644 --- a/experiments/les_strats/global_parallel/sysimage.sbatch +++ b/experiments/les_strats/global_parallel/sysimage.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=20G # memory per CPU core #SBATCH -J "sys_im" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project -C skylake-avx512 create_tc_so.jl diff --git a/experiments/optimal_design/SCT_run.sbatch b/experiments/optimal_design/SCT_run.sbatch index 5a61a1dde..9a1b43a4a 100644 --- a/experiments/optimal_design/SCT_run.sbatch +++ b/experiments/optimal_design/SCT_run.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "hadgem" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project -e 'using Pkg; Pkg.instantiate(); Pkg.API.precompile()' diff --git a/experiments/optimal_design/global_parallel/ekp_par_calibration.sbatch b/experiments/optimal_design/global_parallel/ekp_par_calibration.sbatch index 148aa1050..94eb4dbef 100644 --- a/experiments/optimal_design/global_parallel/ekp_par_calibration.sbatch +++ b/experiments/optimal_design/global_parallel/ekp_par_calibration.sbatch @@ -19,7 +19,7 @@ n_proc_scm=10 echo "Initializing calibration with ${n} ensemble members and ${n_it} iterations." module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 export JULIA_NUM_THREADS=${SLURM_CPUS_PER_TASK:=1} export JULIA_MPI_BINARY=system diff --git a/experiments/optimal_design/global_parallel/init.sbatch b/experiments/optimal_design/global_parallel/init.sbatch index 02cadf601..02b11ae0f 100644 --- a/experiments/optimal_design/global_parallel/init.sbatch +++ b/experiments/optimal_design/global_parallel/init.sbatch @@ -7,7 +7,7 @@ #SBATCH -J "sct_init" # job name #julia package management -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 config=${1?Error: no config file given} job_id=${2?Error: no job ID given} diff --git a/experiments/optimal_design/global_parallel/parallel_scm_eval.sbatch b/experiments/optimal_design/global_parallel/parallel_scm_eval.sbatch index 5785b02ba..2dad1cd28 100644 --- a/experiments/optimal_design/global_parallel/parallel_scm_eval.sbatch +++ b/experiments/optimal_design/global_parallel/parallel_scm_eval.sbatch @@ -5,7 +5,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "sct_run" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} n_proc_scm=${3?Error: number of processes not given} diff --git a/experiments/optimal_design/global_parallel/precondition_prior.sbatch b/experiments/optimal_design/global_parallel/precondition_prior.sbatch index 121671592..b942eaa6b 100644 --- a/experiments/optimal_design/global_parallel/precondition_prior.sbatch +++ b/experiments/optimal_design/global_parallel/precondition_prior.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=12G # memory per CPU core #SBATCH -J "precond" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} diff --git a/experiments/optimal_design/global_parallel/restart.sbatch b/experiments/optimal_design/global_parallel/restart.sbatch index b2a5f1ef0..b0dbca874 100644 --- a/experiments/optimal_design/global_parallel/restart.sbatch +++ b/experiments/optimal_design/global_parallel/restart.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "restart" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 output_dir=${1?Error: no output directory given} job_id=${2?Error: no job ID given} diff --git a/experiments/optimal_design/global_parallel/restart_ekp_par_calibration.sbatch b/experiments/optimal_design/global_parallel/restart_ekp_par_calibration.sbatch index bfe2c5e57..da968b020 100644 --- a/experiments/optimal_design/global_parallel/restart_ekp_par_calibration.sbatch +++ b/experiments/optimal_design/global_parallel/restart_ekp_par_calibration.sbatch @@ -26,7 +26,7 @@ n_proc_scm=10 echo "Restarting calibration with ${n} ensemble members and ${n_it} iterations (grand total)." module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 export JULIA_NUM_THREADS=${SLURM_CPUS_PER_TASK:=1} export JULIA_MPI_BINARY=system diff --git a/experiments/optimal_design/global_parallel/step_ekp.sbatch b/experiments/optimal_design/global_parallel/step_ekp.sbatch index 65d08b846..db3d0b5cd 100644 --- a/experiments/optimal_design/global_parallel/step_ekp.sbatch +++ b/experiments/optimal_design/global_parallel/step_ekp.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "sct_cont" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} job_dir=$(head $job_id".txt" | tail -1) diff --git a/experiments/optimal_design/global_parallel/sysimage.sbatch b/experiments/optimal_design/global_parallel/sysimage.sbatch index 8eba44b0f..2aace9bbb 100644 --- a/experiments/optimal_design/global_parallel/sysimage.sbatch +++ b/experiments/optimal_design/global_parallel/sysimage.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=20G # memory per CPU core #SBATCH -J "sys_im" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project -C skylake-avx512 create_tc_so.jl diff --git a/experiments/scm_pycles_pipeline/hpc_parallel/ekp_calibration.sbatch b/experiments/scm_pycles_pipeline/hpc_parallel/ekp_calibration.sbatch index dafa66d77..03fe87ed6 100644 --- a/experiments/scm_pycles_pipeline/hpc_parallel/ekp_calibration.sbatch +++ b/experiments/scm_pycles_pipeline/hpc_parallel/ekp_calibration.sbatch @@ -17,7 +17,7 @@ n_it=$(grep N_iter ${config} | cut -d= -f2 | cut -d# -f1 | xargs) echo "Initializing calibration with ${n} ensemble members and ${n_it} iterations." module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 export JULIA_NUM_THREADS=${SLURM_CPUS_PER_TASK:=1} export JULIA_MPI_BINARY=system diff --git a/experiments/scm_pycles_pipeline/hpc_parallel/init.sbatch b/experiments/scm_pycles_pipeline/hpc_parallel/init.sbatch index 546f6889f..012171e3a 100644 --- a/experiments/scm_pycles_pipeline/hpc_parallel/init.sbatch +++ b/experiments/scm_pycles_pipeline/hpc_parallel/init.sbatch @@ -7,7 +7,7 @@ #SBATCH -J "ekp_init" # job name #julia package management -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 config=${1?Error: no config file given} job_id=${2?Error: no job ID given} diff --git a/experiments/scm_pycles_pipeline/hpc_parallel/precondition_prior.sbatch b/experiments/scm_pycles_pipeline/hpc_parallel/precondition_prior.sbatch index f960c28fa..32f6fc693 100644 --- a/experiments/scm_pycles_pipeline/hpc_parallel/precondition_prior.sbatch +++ b/experiments/scm_pycles_pipeline/hpc_parallel/precondition_prior.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "precond" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} diff --git a/experiments/scm_pycles_pipeline/hpc_parallel/single_scm_eval.sbatch b/experiments/scm_pycles_pipeline/hpc_parallel/single_scm_eval.sbatch index 66179a01b..517b114a3 100644 --- a/experiments/scm_pycles_pipeline/hpc_parallel/single_scm_eval.sbatch +++ b/experiments/scm_pycles_pipeline/hpc_parallel/single_scm_eval.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "scm_run" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} diff --git a/experiments/scm_pycles_pipeline/hpc_parallel/step_ekp.sbatch b/experiments/scm_pycles_pipeline/hpc_parallel/step_ekp.sbatch index f86ffc813..3253df800 100644 --- a/experiments/scm_pycles_pipeline/hpc_parallel/step_ekp.sbatch +++ b/experiments/scm_pycles_pipeline/hpc_parallel/step_ekp.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=6G # memory per CPU core #SBATCH -J "ekp_cont" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 iteration_=${1?Error: no iteration given} job_id=${2?Error: no job ID given} job_dir=$(head $job_id".txt" | tail -1) diff --git a/experiments/scm_pycles_pipeline/hpc_parallel/sysimage.sbatch b/experiments/scm_pycles_pipeline/hpc_parallel/sysimage.sbatch index 8986d2e7d..8e8226c7f 100644 --- a/experiments/scm_pycles_pipeline/hpc_parallel/sysimage.sbatch +++ b/experiments/scm_pycles_pipeline/hpc_parallel/sysimage.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=20G # memory per CPU core #SBATCH -J "sys_im" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project create_tc_so.jl diff --git a/experiments/scm_pycles_pipeline/julia_parallel/calibrate_script b/experiments/scm_pycles_pipeline/julia_parallel/calibrate_script index 6263626ed..ca3ca85af 100644 --- a/experiments/scm_pycles_pipeline/julia_parallel/calibrate_script +++ b/experiments/scm_pycles_pipeline/julia_parallel/calibrate_script @@ -12,7 +12,7 @@ config=${1?Error: no config file given} module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project -e 'using Pkg; Pkg.instantiate(); Pkg.API.precompile()' julia --project -p 10 calibrate.jl --config $config diff --git a/pull_request_template.md b/pull_request_template.md index 7929ee32c..c2cbe8e8a 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -4,6 +4,6 @@ ## Checklist before requesting a review / merging - [ ] I have formatted the code using `julia --project=.dev .dev/climaformat.jl .` -- [ ] I have updated all test manifests using `julia --project .dev/up_deps.jl .` with Julia 1.9.3. +- [ ] I have updated all test manifests using `julia --project .dev/up_deps.jl .` with Julia 1.10.0. - [ ] If core features are added, I have added appropriate test coverage. - [ ] If new functions and structs are added, they are documented through docstrings. \ No newline at end of file diff --git a/run_tests.sbatch b/run_tests.sbatch index cf2006409..e5d4e932c 100644 --- a/run_tests.sbatch +++ b/run_tests.sbatch @@ -6,6 +6,6 @@ #SBATCH --mem-per-cpu=10G # memory per CPU core #SBATCH -J "tests" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project test/runtests.jl diff --git a/tools/TCRunner.sbatch b/tools/TCRunner.sbatch index 9f1d4d0bf..9ba39bf35 100644 --- a/tools/TCRunner.sbatch +++ b/tools/TCRunner.sbatch @@ -9,7 +9,7 @@ #SBATCH --output=slurm_TCRunner_%j.out module purge -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project -e 'using Pkg; Pkg.instantiate(); Pkg.API.precompile()' julia -p15 TCRunner.jl "$@" diff --git a/up_deps.sbatch b/up_deps.sbatch index 1b19ad468..dc1e905a0 100644 --- a/up_deps.sbatch +++ b/up_deps.sbatch @@ -6,7 +6,7 @@ #SBATCH --mem-per-cpu=10G # memory per CPU core #SBATCH -J "up_deps" # job name -module load julia/1.9.3 openmpi/4.1.5 +module load julia/1.10.0 openmpi/4.1.5 julia --project .dev/up_deps.jl julia --project=.dev .dev/climaformat.jl .