From c41188c25dc2a08133568bdc053e08071e1546b1 Mon Sep 17 00:00:00 2001 From: Kaveh Haghighi Mood Date: Fri, 4 Mar 2022 13:24:57 +0100 Subject: [PATCH] Update for the bugfix in JUBE 2.4.2. Code will not work with older JUBE versions! --- README.md | 5 +---- benchmarks/hpc_benchmark_2.yaml | 8 ++++---- benchmarks/hpc_benchmark_3.yaml | 8 ++++---- benchmarks/hpc_benchmark_31.yaml | 8 ++++---- benchmarks/microcircuit.yaml | 8 ++++---- benchmarks/multi-area-model_2.yaml | 8 ++++---- benchmarks/multi-area-model_3.yaml | 8 ++++---- benchmarks/template.yaml | 8 ++++---- 8 files changed, 29 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 04eeb87..3b0b429 100755 --- a/README.md +++ b/README.md @@ -88,11 +88,8 @@ tar -xzf git-annex-standalone-amd64.tar.gz export PATH=$PATH:/git-annex.linux ``` - [JUBE](https://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/JUBE/_node.html) -_Note that if you are using the JUBE version 2.4.1 or lower, the following export command is required for executing benchmarks due to a known bug. Once the bug is fixed, the export will become unnecessary and the documentation here will be updated accordingly._ +_Note that JUBE version 2.4.2 or later is necessary_ -```bash -export JUBE_INCLUDE_PATH="config/:helpers/" -``` - [Builder](https://github.com/INM-6/Builder) + see Builder documentation for installation guide diff --git a/benchmarks/hpc_benchmark_2.yaml b/benchmarks/hpc_benchmark_2.yaml index e57fcf5..3b497af 100644 --- a/benchmarks/hpc_benchmark_2.yaml +++ b/benchmarks/hpc_benchmark_2.yaml @@ -14,10 +14,10 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# include-path: # not working due to a bug in JUBE. Uncomment after next release! -# path: -# - ../helpers/ -# - ../config/ +include-path: + path: + - ../helpers/ + - ../config/ # model-specific name and output path name: HPC diff --git a/benchmarks/hpc_benchmark_3.yaml b/benchmarks/hpc_benchmark_3.yaml index b689709..e35df6e 100644 --- a/benchmarks/hpc_benchmark_3.yaml +++ b/benchmarks/hpc_benchmark_3.yaml @@ -14,10 +14,10 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# include-path: # not working due to a bug in JUBE. Uncomment after next release! -# path: -# - ../helpers/ -# - ../config/ +include-path: + path: + - ../helpers/ + - ../config/ # model-specific name and output path name: HPC diff --git a/benchmarks/hpc_benchmark_31.yaml b/benchmarks/hpc_benchmark_31.yaml index b1cd8ae..b3222ac 100644 --- a/benchmarks/hpc_benchmark_31.yaml +++ b/benchmarks/hpc_benchmark_31.yaml @@ -14,10 +14,10 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# include-path: # not working due to a bug in JUBE. Uncomment after next release! -# path: -# - ../helpers/ -# - ../config/ +include-path: + path: + - ../helpers/ + - ../config/ # model-specific name and output path name: HPC diff --git a/benchmarks/microcircuit.yaml b/benchmarks/microcircuit.yaml index 14b7a5d..8c87e4c 100644 --- a/benchmarks/microcircuit.yaml +++ b/benchmarks/microcircuit.yaml @@ -14,10 +14,10 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# include-path: # not working due to a bug in JUBE. Uncomment after next release! -# path: -# - ../helpers/ -# - ../config/ +include-path: + path: + - ../helpers/ + - ../config/ name: microcircuit # model-specific name and output path diff --git a/benchmarks/multi-area-model_2.yaml b/benchmarks/multi-area-model_2.yaml index 5d3a133..6b66d50 100644 --- a/benchmarks/multi-area-model_2.yaml +++ b/benchmarks/multi-area-model_2.yaml @@ -14,10 +14,10 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# include-path: # not working due to a bug in JUBE. Uncomment after next release! -# path: -# - ../helpers/ -# - ../config/ +include-path: + path: + - ../helpers/ + - ../config/ # model-specific name and output path name: MAM diff --git a/benchmarks/multi-area-model_3.yaml b/benchmarks/multi-area-model_3.yaml index 9346c2a..b97fed9 100644 --- a/benchmarks/multi-area-model_3.yaml +++ b/benchmarks/multi-area-model_3.yaml @@ -14,10 +14,10 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# include-path: # not working due to a bug in JUBE. Uncomment after next release! -# path: -# - ../helpers/ -# - ../config/ +include-path: + path: + - ../helpers/ + - ../config/ # model-specific name and output path name: MAM diff --git a/benchmarks/template.yaml b/benchmarks/template.yaml index 15ee3da..a8c9baf 100644 --- a/benchmarks/template.yaml +++ b/benchmarks/template.yaml @@ -14,10 +14,10 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# include-path: # not working due to a bug in JUBE. Uncomment after next release! -# path: -# - ../helpers/ -# - ../config/ +include-path: + path: + - ../helpers/ + - ../config/ ### EDIT BELOW