From f56963e30081322c4fb7e5a68986990e331609df Mon Sep 17 00:00:00 2001 From: Codeamic Date: Tue, 29 Mar 2022 19:10:13 +0100 Subject: [PATCH 01/11] rename Json Files --- benchmarks/cubicle/german_pfs.cub | 0 micro_multicore.json => micro.json | 0 nightly_navajo.sh | 0 nightly_turing.sh | 0 multicore_parallel_navajo_run_config.json => parallel_navajo.json | 0 multicore_parallel_run_config.json => parallel_turing.json | 0 run_config.json => sequential.json | 0 7 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 benchmarks/cubicle/german_pfs.cub rename micro_multicore.json => micro.json (100%) mode change 100755 => 100644 nightly_navajo.sh mode change 100755 => 100644 nightly_turing.sh rename multicore_parallel_navajo_run_config.json => parallel_navajo.json (100%) rename multicore_parallel_run_config.json => parallel_turing.json (100%) rename run_config.json => sequential.json (100%) diff --git a/benchmarks/cubicle/german_pfs.cub b/benchmarks/cubicle/german_pfs.cub old mode 100755 new mode 100644 diff --git a/micro_multicore.json b/micro.json similarity index 100% rename from micro_multicore.json rename to micro.json diff --git a/nightly_navajo.sh b/nightly_navajo.sh old mode 100755 new mode 100644 diff --git a/nightly_turing.sh b/nightly_turing.sh old mode 100755 new mode 100644 diff --git a/multicore_parallel_navajo_run_config.json b/parallel_navajo.json similarity index 100% rename from multicore_parallel_navajo_run_config.json rename to parallel_navajo.json diff --git a/multicore_parallel_run_config.json b/parallel_turing.json similarity index 100% rename from multicore_parallel_run_config.json rename to parallel_turing.json diff --git a/run_config.json b/sequential.json similarity index 100% rename from run_config.json rename to sequential.json From e8eda9e236f06db94922639dae092c0b29d5a4e2 Mon Sep 17 00:00:00 2001 From: codeamic Date: Wed, 30 Mar 2022 11:35:26 +0100 Subject: [PATCH 02/11] update --- README.md | 24 ++++++++++++------------ benchmarks/cubicle/german_pfs.cub | 0 nightly_navajo.sh | 0 nightly_turing.sh | 0 4 files changed, 12 insertions(+), 12 deletions(-) mode change 100644 => 100755 benchmarks/cubicle/german_pfs.cub mode change 100644 => 100755 nightly_navajo.sh mode change 100644 => 100755 nightly_turing.sh diff --git a/README.md b/README.md index c47c0f0848..ed9c0cf926 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ dependencies. Sandmark uses opam, with a static local repository, to build external libraries and applications. It then builds any sandmark OCaml benchmarks and any data dependencies. Following this it runs the -benchmarks as defined in the `run_config.json` +benchmarks as defined in the `sequential.json` These stages are implemented in: @@ -57,7 +57,7 @@ These stages are implemented in: - Runplan: the list of benchmarks which will run along with the measurement wrapper (e.g. orun or perf) is specified in - `run_config.json`. This config file is used to generate dune files + `sequential.json`. This config file is used to generate dune files which will run the benchmarks. - Build: dune is used to build all the sandmark OCaml benchmarks that @@ -65,7 +65,7 @@ These stages are implemented in: - Execute: dune is used to execute all the benchmarks sepcified in the runplan using the benchmark wrapper defined in - `run_config.json` and specified via the `RUN_BENCH_TARGET` variable + `sequential.json` and specified via the `RUN_BENCH_TARGET` variable passed to the makefile. ## Configuration of the compiler build @@ -141,7 +141,7 @@ sudo setcap cap_sys_nice=ep /usr/bin/chrt ### Configuring the benchmark runs A config file can be specified with the environment variable `RUN_CONFIG_JSON`, -and the default value is `run_config.json`. This file lists the executable to +and the default value is `sequential.json`. This file lists the executable to run and the wrapper which will be used to collect data (e.g. orun or perf). You can edit this file to change benchmark parameters or wrappers. @@ -177,13 +177,13 @@ current tags are: The benchmarking machine `turing` is an Intel Xeon Gold 5120 CPU with 64GB of RAM housed at IITM. -The `run_config.json` file may be filtered based on the tag. For example, +The `sequential.json` file may be filtered based on the tag. For example, ```bash $ TAG='"macro_bench"' make run_config_filtered.json ``` -filters the `run_config.json` file to only contain the benchmarks tagged as +filters the `sequential.json` file to only contain the benchmarks tagged as `macro_bench`. ### Running benchmarks @@ -261,17 +261,17 @@ You can add new benchmarks as follows: - **Add commands to run your applications:** Add an entry for your benchmark run to the appropriate config file; - `run_config.json` for sequential benchmarks and - `multicore_parallel_run_config.json` for parallel benchmarks. + `sequential.json` for sequential benchmarks and + `parallel_turing.json` for parallel benchmarks. ### Config files The `*_config.json` files used to build benchmarks - - **run_config.json** : Runs sequential benchmarks with stock OCaml variants in CI and sandmark-nightly on the IITM machine(turing) - - **multicore_parallel_run_config.json** : Runs parallel benchmarks with multicore OCaml in CI and sandmark-nightly on the IITM machine(turing) - - **multicore_parallel_navajo_run_config.json** : Runs parallel benchmarks with multicore OCaml in sandmark-nightly on Navajo (AMD EPYC 7551 32-Core Processor) machine - - **micro_multicore.json** : To locally run multicore specific micro benchmarks + - **sequential.json** : Runs sequential benchmarks with stock OCaml variants in CI and sandmark-nightly on the IITM machine(turing) + - **parallel_turing.json** : Runs parallel benchmarks with multicore OCaml in CI and sandmark-nightly on the IITM machine(turing) + - **parallel_navajo.json** : Runs parallel benchmarks with multicore OCaml in sandmark-nightly on Navajo (AMD EPYC 7551 32-Core Processor) machine + - **micro.json** : To locally run multicore specific micro benchmarks ### Benchmarks status diff --git a/benchmarks/cubicle/german_pfs.cub b/benchmarks/cubicle/german_pfs.cub old mode 100644 new mode 100755 diff --git a/nightly_navajo.sh b/nightly_navajo.sh old mode 100644 new mode 100755 diff --git a/nightly_turing.sh b/nightly_turing.sh old mode 100644 new mode 100755 From 5ec897e052c240e015f68df3536c8106456ad52c Mon Sep 17 00:00:00 2001 From: codeamic Date: Thu, 31 Mar 2022 07:30:52 +0100 Subject: [PATCH 03/11] updates --- README.md | 2 +- ocaml-versions/custom.json | 8 ++++---- ocaml-versions/custom_navajo.json | 4 ++-- ocaml-versions/custom_turing.json | 4 ++-- run_all_custom.sh | 2 +- run_all_serial.sh | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ed9c0cf926..33c4224d08 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ RAM housed at IITM. The `sequential.json` file may be filtered based on the tag. For example, ```bash -$ TAG='"macro_bench"' make run_config_filtered.json +$ TAG='"macro_bench"' make sequential_filtered.json ``` filters the `sequential.json` file to only contain the benchmarks tagged as diff --git a/ocaml-versions/custom.json b/ocaml-versions/custom.json index bc65c42bac..131274c43c 100644 --- a/ocaml-versions/custom.json +++ b/ocaml-versions/custom.json @@ -2,14 +2,14 @@ { "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz", "tag": "macro_bench", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.0+trunk+sequential", "expiry": "2100-01-01" }, { "url": "https://github.com/ocaml/ocaml/archive/b73cbbea4bc40ffd26a459d594a39b99cec4273d.zip", "tag": "macro_bench", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.0+stable+sequential", "expiry": "2100-01-01" }, @@ -30,8 +30,8 @@ { "url": "https://github.com/sadiqj/ocaml/archive/refs/heads/eventring-pr.zip", "tag": "run_in_ci", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.0+trunk+sadiqj+pr10964", "expiry": "2022-02-25" } -] +] \ No newline at end of file diff --git a/ocaml-versions/custom_navajo.json b/ocaml-versions/custom_navajo.json index 591749cdb2..5b1c5fdf21 100644 --- a/ocaml-versions/custom_navajo.json +++ b/ocaml-versions/custom_navajo.json @@ -2,7 +2,7 @@ { "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz", "tag": "macro_bench", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.0+trunk+sequential", "expiry": "2100-01-01" }, @@ -16,7 +16,7 @@ { "url": "https://github.com/gadmm/ocaml/archive/refs/heads/multicore_async_actions.zip", "tag": "macro_bench", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.0+trunk+sequential+gadmm+pr11057", "expiry": "2022-03-20" }, diff --git a/ocaml-versions/custom_turing.json b/ocaml-versions/custom_turing.json index 861e3925fc..d4484b784e 100644 --- a/ocaml-versions/custom_turing.json +++ b/ocaml-versions/custom_turing.json @@ -2,7 +2,7 @@ { "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz", "tag": "macro_bench", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.0+trunk+sequential", "expiry": "2100-01-01" }, @@ -16,7 +16,7 @@ { "url": "https://github.com/gadmm/ocaml/archive/refs/heads/multicore_async_actions.zip", "tag": "macro_bench", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.0+trunk+sequential+gadmm+pr11057", "expiry": "2022-03-20" }, diff --git a/run_all_custom.sh b/run_all_custom.sh index 8ea202edeb..314db03ff3 100644 --- a/run_all_custom.sh +++ b/run_all_custom.sh @@ -68,7 +68,7 @@ while [ $i -lt ${COUNT} ]; do CONFIG_TAG=`jq -r '.['$i'].tag // "macro_bench"' "${CUSTOM_FILE}"` if [ $j -eq 0 ]; then - CONFIG_RUN_JSON="run_config_filtered.json" + CONFIG_RUN_JSON="sequential_filtered.json" CONFIG_NAME="${CONFIG_NAME}+sequential" else CONFIG_NAME="${CONFIG_NAME}+parallel" diff --git a/run_all_serial.sh b/run_all_serial.sh index add843933b..8a4c8bf3a8 100644 --- a/run_all_serial.sh +++ b/run_all_serial.sh @@ -1,5 +1,5 @@ #!/bin/bash -TAG='"macro_bench"' make run_config_filtered.json +TAG='"macro_bench"' make sequential_filtered.json -USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.0.0+stable.bench +USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=sequential_filtered.json make ocaml-versions/5.0.0+stable.bench From abf4ee47fc667a762f129f3e5b08464d266c239f Mon Sep 17 00:00:00 2001 From: codeamic Date: Thu, 31 Mar 2022 18:50:32 +0100 Subject: [PATCH 04/11] update --- ocaml-versions/custom.json | 4 ++-- ocaml-versions/custom_navajo.json | 4 ++-- ocaml-versions/custom_turing.json | 4 ++-- run_all_custom.sh | 4 ++-- run_all_parallel.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ocaml-versions/custom.json b/ocaml-versions/custom.json index 131274c43c..6e899d3778 100644 --- a/ocaml-versions/custom.json +++ b/ocaml-versions/custom.json @@ -16,14 +16,14 @@ { "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz", "tag": "macro_bench", - "config_json": "multicore_parallel_run_config_filtered.json", + "config_json": "parallel_turing_filtered.json", "name": "5.0.0+trunk+parallel", "expiry": "2100-01-01" }, { "url": "https://github.com/ocaml/ocaml/archive/b73cbbea4bc40ffd26a459d594a39b99cec4273d.zip", "tag": "macro_bench", - "config_json": "multicore_parallel_run_config_filtered.json", + "config_json": "parallel_turing_filtered.json", "name": "5.0.0+stable+parallel", "expiry": "2100-01-01" }, diff --git a/ocaml-versions/custom_navajo.json b/ocaml-versions/custom_navajo.json index 5b1c5fdf21..862c96e212 100644 --- a/ocaml-versions/custom_navajo.json +++ b/ocaml-versions/custom_navajo.json @@ -9,7 +9,7 @@ { "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz", "tag": "macro_bench", - "config_json": "multicore_parallel_navajo_run_config_filtered.json", + "config_json": "parallel_navajo_filtered.json", "name": "5.0.0+trunk+parallel", "expiry": "2100-01-01" }, @@ -23,7 +23,7 @@ { "url": "https://github.com/gadmm/ocaml/archive/refs/heads/multicore_async_actions.zip", "tag": "macro_bench", - "config_json": "multicore_parallel_navajo_run_config_filtered.json", + "config_json": "parallel_navajo_filtered.json", "name": "5.0.0+trunk+parallel+gadmm+pr11057", "expiry": "2022-03-20" } diff --git a/ocaml-versions/custom_turing.json b/ocaml-versions/custom_turing.json index d4484b784e..e4f1a18982 100644 --- a/ocaml-versions/custom_turing.json +++ b/ocaml-versions/custom_turing.json @@ -9,7 +9,7 @@ { "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz", "tag": "macro_bench", - "config_json": "multicore_parallel_run_config_filtered.json", + "config_json": "parallel_turing_filtered.json", "name": "5.0.0+trunk+parallel", "expiry": "2100-01-01" }, @@ -23,7 +23,7 @@ { "url": "https://github.com/gadmm/ocaml/archive/refs/heads/multicore_async_actions.zip", "tag": "macro_bench", - "config_json": "multicore_parallel_run_config_filtered.json", + "config_json": "parallel_turing_filtered.json", "name": "5.0.0+trunk+parallel+gadmm+pr11057", "expiry": "2022-03-20" } diff --git a/run_all_custom.sh b/run_all_custom.sh index 314db03ff3..ef2b364e8b 100644 --- a/run_all_custom.sh +++ b/run_all_custom.sh @@ -73,9 +73,9 @@ while [ $i -lt ${COUNT} ]; do else CONFIG_NAME="${CONFIG_NAME}+parallel" if [ "${HOSTNAME}" == "navajo" ]; then - CONFIG_RUN_JSON="multicore_parallel_navajo_run_config_filtered.json" + CONFIG_RUN_JSON="parallel_navajo_filtered.json" else - CONFIG_RUN_JSON="multicore_parallel_run_config_filtered.json" + CONFIG_RUN_JSON="parallel_turing_filtered.json" fi fi diff --git a/run_all_parallel.sh b/run_all_parallel.sh index d8d558b21e..7f78deecef 100644 --- a/run_all_parallel.sh +++ b/run_all_parallel.sh @@ -6,10 +6,10 @@ # sudo setcap cap_sys_nice=ep /usr/bin/chrt # -TAG='"macro_bench"' make multicore_parallel_run_config_filtered.json +TAG='"macro_bench"' make parallel_turing_filtered.json USE_SYS_DUNE_HACK=1 \ RUN_BENCH_TARGET=run_orunchrt \ BUILD_BENCH_TARGET=multibench_parallel \ - RUN_CONFIG_JSON=multicore_parallel_run_config_filtered.json \ + RUN_CONFIG_JSON=parallel_turing_filtered.json \ make ocaml-versions/5.0.0+stable.bench From 2116db068a142931853ccb6825da33adec4e4d9d Mon Sep 17 00:00:00 2001 From: codeamic Date: Fri, 1 Apr 2022 15:46:04 +0100 Subject: [PATCH 05/11] updates --- .drone.yml | 8 ++++---- ...son => parallel_turing_filtered_filtered_2domains.json | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename multicore_parallel_run_config_filtered_filtered_2domains.json => parallel_turing_filtered_filtered_2domains.json (100%) diff --git a/.drone.yml b/.drone.yml index 4b20391225..d3d181e7e0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,8 +46,8 @@ steps: - export OPAM_DISABLE_SANDBOXING=true - TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json - TAG='"macro_bench"' make multicore_parallel_run_config_filtered_filtered.json - - make multicore_parallel_run_config_filtered_filtered_2domains.json - - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=multicore_parallel_run_config_filtered_filtered_2domains.json make ocaml-versions/5.0.0+stable.bench + - make parallel_turing_filtered_filtered_2domains.json + - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=parallel_turing_filtered_filtered_2domains.json make ocaml-versions/5.0.0+stable.bench - ls _results - cat _results/* @@ -100,8 +100,8 @@ steps: - export OPAM_DISABLE_SANDBOXING=true - TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json - TAG='"macro_bench"' make multicore_parallel_run_config_filtered_filtered.json - - make multicore_parallel_run_config_filtered_filtered_2domains.json - - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=multicore_parallel_run_config_filtered_filtered_2domains.json make ocaml-versions/5.0.0+trunk.bench + - make parallel_turing_filtered_filtered_2domains.json + - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=parallel_turing_filtered_filtered_2domains.json make ocaml-versions/5.0.0+trunk.bench - ls _results - cat _results/* diff --git a/multicore_parallel_run_config_filtered_filtered_2domains.json b/parallel_turing_filtered_filtered_2domains.json similarity index 100% rename from multicore_parallel_run_config_filtered_filtered_2domains.json rename to parallel_turing_filtered_filtered_2domains.json From 4fa2829828b53a142d84c174bd2046542c7eb0ad Mon Sep 17 00:00:00 2001 From: codeamic Date: Mon, 4 Apr 2022 07:15:49 +0100 Subject: [PATCH 06/11] update --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index d3d181e7e0..0cccfcaa6a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -45,7 +45,7 @@ steps: - export ITER=1 - export OPAM_DISABLE_SANDBOXING=true - TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json - - TAG='"macro_bench"' make multicore_parallel_run_config_filtered_filtered.json + - TAG='"macro_bench"' make parallel_turing_filtered_filtered.json - make parallel_turing_filtered_filtered_2domains.json - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=parallel_turing_filtered_filtered_2domains.json make ocaml-versions/5.0.0+stable.bench - ls _results @@ -72,7 +72,7 @@ steps: - eval $(opam env) - export ITER=1 - export OPAM_DISABLE_SANDBOXING=true - - TAG='"run_in_ci"' make run_config_filtered.json + - TAG='"run_in_ci"' make sequential_filtered.json - USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.0.0+trunk.bench - ls _results - cat _results/* @@ -98,8 +98,8 @@ steps: - eval $(opam env) - export ITER=1 - export OPAM_DISABLE_SANDBOXING=true - - TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json - - TAG='"macro_bench"' make multicore_parallel_run_config_filtered_filtered.json + - TAG='"run_in_ci"' make parallel_turing_filtered.json + - TAG='"macro_bench"' make parallel_turing_filtered.json - make parallel_turing_filtered_filtered_2domains.json - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=parallel_turing_filtered_filtered_2domains.json make ocaml-versions/5.0.0+trunk.bench - ls _results From 28ad0105f80eae1b7a32578b52da3a63a7384976 Mon Sep 17 00:00:00 2001 From: codeamic Date: Tue, 5 Apr 2022 09:50:01 +0100 Subject: [PATCH 07/11] update --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0cccfcaa6a..37d15bae66 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,8 +18,8 @@ steps: - eval $(opam env) - export ITER=1 - export OPAM_DISABLE_SANDBOXING=true - - TAG='"run_in_ci"' make run_config_filtered.json - - USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.0.0+stable.bench + - TAG='"run_in_ci"' make sequential_filtered.json + - USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=sequential_filtered.json make ocaml-versions/5.0.0+stable.bench - ls _results - cat _results/* @@ -44,7 +44,7 @@ steps: - eval $(opam env) - export ITER=1 - export OPAM_DISABLE_SANDBOXING=true - - TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json + - TAG='"run_in_ci"' make parallel_turing_filtered.json - TAG='"macro_bench"' make parallel_turing_filtered_filtered.json - make parallel_turing_filtered_filtered_2domains.json - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=parallel_turing_filtered_filtered_2domains.json make ocaml-versions/5.0.0+stable.bench @@ -73,7 +73,7 @@ steps: - export ITER=1 - export OPAM_DISABLE_SANDBOXING=true - TAG='"run_in_ci"' make sequential_filtered.json - - USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.0.0+trunk.bench + - USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=sequential_filtered.json make ocaml-versions/5.0.0+trunk.bench - ls _results - cat _results/* From 1c310af662198c459c307fd4f54f2b96f7c73a30 Mon Sep 17 00:00:00 2001 From: codeamic Date: Thu, 7 Apr 2022 19:59:50 +0100 Subject: [PATCH 08/11] update --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 37d15bae66..2c9eecb30e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,7 +44,7 @@ steps: - eval $(opam env) - export ITER=1 - export OPAM_DISABLE_SANDBOXING=true - - TAG='"run_in_ci"' make parallel_turing_filtered.json + - TAG='"run_in_ci"' make parallel_turing_filtered_filtered.json - TAG='"macro_bench"' make parallel_turing_filtered_filtered.json - make parallel_turing_filtered_filtered_2domains.json - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=parallel_turing_filtered_filtered_2domains.json make ocaml-versions/5.0.0+stable.bench From 0f768f6e835f1808fdc1c1a7437b57c52dcb76f0 Mon Sep 17 00:00:00 2001 From: codeamic Date: Fri, 8 Apr 2022 22:26:19 +0100 Subject: [PATCH 09/11] updated changes --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2c9eecb30e..8d3ce3a97b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,8 +44,8 @@ steps: - eval $(opam env) - export ITER=1 - export OPAM_DISABLE_SANDBOXING=true - - TAG='"run_in_ci"' make parallel_turing_filtered_filtered.json - - TAG='"macro_bench"' make parallel_turing_filtered_filtered.json + - TAG='"run_in_ci"' make parallel_turing_filtered.json + - TAG='"macro_bench"' make parallel_turing_filtered.json - make parallel_turing_filtered_filtered_2domains.json - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=parallel_turing_filtered_filtered_2domains.json make ocaml-versions/5.0.0+stable.bench - ls _results @@ -98,8 +98,8 @@ steps: - eval $(opam env) - export ITER=1 - export OPAM_DISABLE_SANDBOXING=true - - TAG='"run_in_ci"' make parallel_turing_filtered.json - - TAG='"macro_bench"' make parallel_turing_filtered.json + - TAG='"run_in_ci"' make parallel_turing_filtered_filtered.json + - TAG='"macro_bench"' make parallel_turing_filtered_filtered.json - make parallel_turing_filtered_filtered_2domains.json - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=parallel_turing_filtered_filtered_2domains.json make ocaml-versions/5.0.0+trunk.bench - ls _results From 2821c7b7d53294a83400f2f9590e1ac01f212580 Mon Sep 17 00:00:00 2001 From: codeamic Date: Mon, 11 Apr 2022 15:47:55 +0100 Subject: [PATCH 10/11] updated lines 48 and 101 --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8d3ce3a97b..19bc761625 100644 --- a/.drone.yml +++ b/.drone.yml @@ -45,7 +45,7 @@ steps: - export ITER=1 - export OPAM_DISABLE_SANDBOXING=true - TAG='"run_in_ci"' make parallel_turing_filtered.json - - TAG='"macro_bench"' make parallel_turing_filtered.json + - TAG='"macro_bench"' make parallel_turing_filtered_filtered.json - make parallel_turing_filtered_filtered_2domains.json - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=parallel_turing_filtered_filtered_2domains.json make ocaml-versions/5.0.0+stable.bench - ls _results @@ -98,7 +98,7 @@ steps: - eval $(opam env) - export ITER=1 - export OPAM_DISABLE_SANDBOXING=true - - TAG='"run_in_ci"' make parallel_turing_filtered_filtered.json + - TAG='"run_in_ci"' make parallel_turing_filtered.json - TAG='"macro_bench"' make parallel_turing_filtered_filtered.json - make parallel_turing_filtered_filtered_2domains.json - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=parallel_turing_filtered_filtered_2domains.json make ocaml-versions/5.0.0+trunk.bench From 543030d5f5fd2b4da18605ba3411b64414812de1 Mon Sep 17 00:00:00 2001 From: Ambre Austen Suhamy Date: Mon, 27 Jun 2022 14:22:13 +0200 Subject: [PATCH 11/11] Deleted drone CI to be mergeable on main --- .drone.yml | 128 ----------------------------------------------------- 1 file changed, 128 deletions(-) delete mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 19bc761625..0000000000 --- a/.drone.yml +++ /dev/null @@ -1,128 +0,0 @@ -kind: pipeline -name: 5.0.0+stable+serial - -platform: - os: linux - arch: amd64 - -steps: -- name: 5.0.0+stable - image: ocaml/opam:ubuntu-20.04-ocaml-4.12 - commands: - - sudo apt-get update && sudo apt-get -y install wget pkg-config libgmp-dev m4 libdw-dev jq python3-pip autoconf jo - - pip3 install intervaltree - - sudo chown -R opam . - - eval $(opam env) - - opam update - - opam install dune.2.9.0 - - eval $(opam env) - - export ITER=1 - - export OPAM_DISABLE_SANDBOXING=true - - TAG='"run_in_ci"' make sequential_filtered.json - - USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=sequential_filtered.json make ocaml-versions/5.0.0+stable.bench - - ls _results - - cat _results/* - ---- -kind: pipeline -name: 5.0.0+stable+parallel - -platform: - os: linux - arch: amd64 - -steps: -- name: 5.0.0+stable+parallel - image: ocaml/opam:ubuntu-20.04-ocaml-4.12 - commands: - - sudo apt-get update && sudo apt-get -y install wget pkg-config libgmp-dev m4 libdw-dev jq python3-pip autoconf jo - - pip3 install intervaltree - - sudo chown -R opam . - - eval $(opam env) - - opam update - - opam install dune.2.9.0 - - eval $(opam env) - - export ITER=1 - - export OPAM_DISABLE_SANDBOXING=true - - TAG='"run_in_ci"' make parallel_turing_filtered.json - - TAG='"macro_bench"' make parallel_turing_filtered_filtered.json - - make parallel_turing_filtered_filtered_2domains.json - - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=parallel_turing_filtered_filtered_2domains.json make ocaml-versions/5.0.0+stable.bench - - ls _results - - cat _results/* - ---- -kind: pipeline -name: 5.0.0+trunk+serial - -platform: - os: linux - arch: amd64 - -steps: -- name: 5.0.0+trunk+serial - image: ocaml/opam:ubuntu-20.04-ocaml-4.12 - commands: - - sudo apt-get update && sudo apt-get -y install wget pkg-config libgmp-dev m4 libdw-dev jq python3-pip autoconf jo - - pip3 install intervaltree - - sudo chown -R opam . - - eval $(opam env) - - opam update - - opam install dune.2.9.0 - - eval $(opam env) - - export ITER=1 - - export OPAM_DISABLE_SANDBOXING=true - - TAG='"run_in_ci"' make sequential_filtered.json - - USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=sequential_filtered.json make ocaml-versions/5.0.0+trunk.bench - - ls _results - - cat _results/* - ---- -kind: pipeline -name: 5.0.0+trunk+parallel - -platform: - os: linux - arch: amd64 - -steps: -- name: 5.0.0+trunk+parallel - image: ocaml/opam:ubuntu-20.04-ocaml-4.12 - commands: - - sudo apt-get update && sudo apt-get -y install wget pkg-config libgmp-dev m4 libdw-dev jq python3-pip autoconf jo - - pip3 install intervaltree - - sudo chown -R opam . - - eval $(opam env) - - opam update - - opam install dune.2.9.0 - - eval $(opam env) - - export ITER=1 - - export OPAM_DISABLE_SANDBOXING=true - - TAG='"run_in_ci"' make parallel_turing_filtered.json - - TAG='"macro_bench"' make parallel_turing_filtered_filtered.json - - make parallel_turing_filtered_filtered_2domains.json - - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=parallel_turing_filtered_filtered_2domains.json make ocaml-versions/5.0.0+trunk.bench - - ls _results - - cat _results/* - ---- -kind: pipeline -name: test_notebooks - -platform: - os: linux - arch: amd64 - -steps: -- name: test_notebooks - image: ocaml/opam:ubuntu-20.04-ocaml-4.12 - commands: - - sudo apt-get update && sudo apt-get -y install wget pkg-config libgmp-dev m4 libdw-dev jq python3-pip jo - - export PATH=$PATH:/home/opam/.local/bin - - pip3 install jupyter nbconvert seaborn pandas - - cd notebooks/sequential - - sudo chmod 777 . - - jupyter nbconvert --to html --execute sequential.ipynb - - cd ../parallel - - sudo chmod 777 . - - jupyter nbconvert --to html --execute parallel.ipynb