From bd7c3bdb8a899e6203d4460c2b9388789d5eb1eb Mon Sep 17 00:00:00 2001 From: Pramod Kumbhar Date: Thu, 3 Nov 2022 15:54:56 +0100 Subject: [PATCH 1/3] dummy commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 473f0349b..31b4520b5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ![CoreNEURON CI](https://github.com/BlueBrain/CoreNeuron/workflows/CoreNEURON%20CI/badge.svg) [![codecov](https://codecov.io/gh/BlueBrain/CoreNeuron/branch/master/graph/badge.svg?token=mguTdBx93p)](https://codecov.io/gh/BlueBrain/CoreNeuron) +### Dummy GPU CI Check + ![CoreNEURON](docs/_static/bluebrain_coreneuron.jpg) # CoreNEURON From b2ed0bb9cf8a6a4c28928aadaecc2a1eb07b6ba9 Mon Sep 17 00:00:00 2001 From: pramodk Date: Tue, 15 Nov 2022 23:45:01 +0100 Subject: [PATCH 2/3] And disable github CI pipelines --- {.github => .github-bak}/ISSUE_TEMPLATE/bug_report.md | 0 {.github => .github-bak}/ISSUE_TEMPLATE/config.yml | 0 {.github => .github-bak}/ISSUE_TEMPLATE/feature_request.md | 0 {.github => .github-bak}/problem-matchers/address.json | 0 {.github => .github-bak}/problem-matchers/gcc.json | 0 {.github => .github-bak}/problem-matchers/undefined.json | 0 {.github => .github-bak}/pull_request_template.md | 0 {.github => .github-bak}/workflows/clang_cmake_format_check.yaml | 0 {.github => .github-bak}/workflows/coreneuron-ci.yml | 0 {.github => .github-bak}/workflows/coverage.yml | 0 {.github => .github-bak}/workflows/test-as-submodule.yml | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename {.github => .github-bak}/ISSUE_TEMPLATE/bug_report.md (100%) rename {.github => .github-bak}/ISSUE_TEMPLATE/config.yml (100%) rename {.github => .github-bak}/ISSUE_TEMPLATE/feature_request.md (100%) rename {.github => .github-bak}/problem-matchers/address.json (100%) rename {.github => .github-bak}/problem-matchers/gcc.json (100%) rename {.github => .github-bak}/problem-matchers/undefined.json (100%) rename {.github => .github-bak}/pull_request_template.md (100%) rename {.github => .github-bak}/workflows/clang_cmake_format_check.yaml (100%) rename {.github => .github-bak}/workflows/coreneuron-ci.yml (100%) rename {.github => .github-bak}/workflows/coverage.yml (100%) rename {.github => .github-bak}/workflows/test-as-submodule.yml (100%) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github-bak/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from .github/ISSUE_TEMPLATE/bug_report.md rename to .github-bak/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github-bak/ISSUE_TEMPLATE/config.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/config.yml rename to .github-bak/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github-bak/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from .github/ISSUE_TEMPLATE/feature_request.md rename to .github-bak/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/problem-matchers/address.json b/.github-bak/problem-matchers/address.json similarity index 100% rename from .github/problem-matchers/address.json rename to .github-bak/problem-matchers/address.json diff --git a/.github/problem-matchers/gcc.json b/.github-bak/problem-matchers/gcc.json similarity index 100% rename from .github/problem-matchers/gcc.json rename to .github-bak/problem-matchers/gcc.json diff --git a/.github/problem-matchers/undefined.json b/.github-bak/problem-matchers/undefined.json similarity index 100% rename from .github/problem-matchers/undefined.json rename to .github-bak/problem-matchers/undefined.json diff --git a/.github/pull_request_template.md b/.github-bak/pull_request_template.md similarity index 100% rename from .github/pull_request_template.md rename to .github-bak/pull_request_template.md diff --git a/.github/workflows/clang_cmake_format_check.yaml b/.github-bak/workflows/clang_cmake_format_check.yaml similarity index 100% rename from .github/workflows/clang_cmake_format_check.yaml rename to .github-bak/workflows/clang_cmake_format_check.yaml diff --git a/.github/workflows/coreneuron-ci.yml b/.github-bak/workflows/coreneuron-ci.yml similarity index 100% rename from .github/workflows/coreneuron-ci.yml rename to .github-bak/workflows/coreneuron-ci.yml diff --git a/.github/workflows/coverage.yml b/.github-bak/workflows/coverage.yml similarity index 100% rename from .github/workflows/coverage.yml rename to .github-bak/workflows/coverage.yml diff --git a/.github/workflows/test-as-submodule.yml b/.github-bak/workflows/test-as-submodule.yml similarity index 100% rename from .github/workflows/test-as-submodule.yml rename to .github-bak/workflows/test-as-submodule.yml From 9675a776ba3a2964809dc7e3df3093f2d9ce8a10 Mon Sep 17 00:00:00 2001 From: pramodk Date: Thu, 17 Nov 2022 14:34:13 +0100 Subject: [PATCH 3/3] disable all non-openmp+gpu builds; disable caliper dependency with coreneuron --- .gitlab-ci.yml | 238 ++++++++++++++++++++++++------------------------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad07c642f..c32294ad0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,91 +95,91 @@ build:nmodl: # Otherwise a new py-mpi4py with hpe-mpi%{nvhpc,intel} will be built. # caliper: papi%nvhpc does not build; use the caliper from the deployment # TODO: fix this more robustly so we don't have to play so many games. - SPACK_PACKAGE_DEPENDENCIES: ^hpe-mpi%gcc ^caliper%gcc+cuda cuda_arch=70 + SPACK_PACKAGE_DEPENDENCIES: ^hpe-mpi%gcc # TODO: improve coverage by switching an Intel build to be statically linked # TODO: improve coverage by switching an Intel build to RelWithDebInfo # TODO: improve coverage by enabling +openmp on an Intel build -build:coreneuron:mod2c:intel:shared:debug: - extends: [.build_coreneuron, .spack_intel] - variables: - SPACK_PACKAGE_SPEC: +caliper~gpu~legacy-unit~nmodl~openmp+shared+tests~unified build_type=Debug - -build:coreneuron:nmodl:intel:debug:legacy: - extends: [.build_coreneuron, .spack_intel] - needs: ["build:nmodl"] - variables: - SPACK_PACKAGE_SPEC: +caliper~gpu~legacy-unit+nmodl~openmp~shared~sympy+tests~unified build_type=Debug - -# Disable caliper to improve coverage -build:coreneuron:nmodl:intel:shared:debug: - extends: [.build_coreneuron, .spack_intel] - needs: ["build:nmodl"] - variables: - SPACK_PACKAGE_DEPENDENCIES: ^hpe-mpi%gcc - SPACK_PACKAGE_SPEC: ~caliper~gpu~legacy-unit+nmodl~openmp+shared+sympy+tests~unified build_type=Debug - -# Not linked to a NEURON build+test job, see -# https://github.com/BlueBrain/CoreNeuron/issues/594 -build:coreneuron:mod2c:nvhpc:acc:debug:unified: - extends: [.build_coreneuron, .spack_nvhpc] - variables: - SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit~nmodl+openmp~shared+tests+unified build_type=Debug - -# Shared + OpenACC + OpenMP host threading has problems -build:coreneuron:mod2c:nvhpc:acc:shared: - extends: [.build_coreneuron, .spack_nvhpc] - variables: - SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit~nmodl~openmp+shared+tests~unified build_type=RelWithDebInfo - -build:coreneuron:nmodl:nvhpc:acc:debug:legacy: - extends: [.build_coreneuron, .spack_nvhpc] - needs: ["build:nmodl"] - variables: - SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit+nmodl~openmp~shared~sympy+tests~unified build_type=Debug - -build:coreneuron:nmodl:nvhpc:acc:shared: - extends: [.build_coreneuron, .spack_nvhpc] - needs: ["build:nmodl"] - variables: - SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit+nmodl~openmp+shared+sympy+tests~unified build_type=RelWithDebInfo +#build:coreneuron:mod2c:intel:shared:debug: +# extends: [.build_coreneuron, .spack_intel] +# variables: +# SPACK_PACKAGE_SPEC: +caliper~gpu~legacy-unit~nmodl~openmp+shared+tests~unified build_type=Debug +# +#build:coreneuron:nmodl:intel:debug:legacy: +# extends: [.build_coreneuron, .spack_intel] +# needs: ["build:nmodl"] +# variables: +# SPACK_PACKAGE_SPEC: +caliper~gpu~legacy-unit+nmodl~openmp~shared~sympy+tests~unified build_type=Debug +# +## Disable caliper to improve coverage +#build:coreneuron:nmodl:intel:shared:debug: +# extends: [.build_coreneuron, .spack_intel] +# needs: ["build:nmodl"] +# variables: +# SPACK_PACKAGE_DEPENDENCIES: ^hpe-mpi%gcc +# SPACK_PACKAGE_SPEC: ~caliper~gpu~legacy-unit+nmodl~openmp+shared+sympy+tests~unified build_type=Debug +# +## Not linked to a NEURON build+test job, see +## https://github.com/BlueBrain/CoreNeuron/issues/594 +#build:coreneuron:mod2c:nvhpc:acc:debug:unified: +# extends: [.build_coreneuron, .spack_nvhpc] +# variables: +# SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit~nmodl+openmp~shared+tests+unified build_type=Debug +# +## Shared + OpenACC + OpenMP host threading has problems +#build:coreneuron:mod2c:nvhpc:acc:shared: +# extends: [.build_coreneuron, .spack_nvhpc] +# variables: +# SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit~nmodl~openmp+shared+tests~unified build_type=RelWithDebInfo +# +#build:coreneuron:nmodl:nvhpc:acc:debug:legacy: +# extends: [.build_coreneuron, .spack_nvhpc] +# needs: ["build:nmodl"] +# variables: +# SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit+nmodl~openmp~shared~sympy+tests~unified build_type=Debug +# +#build:coreneuron:nmodl:nvhpc:acc:shared: +# extends: [.build_coreneuron, .spack_nvhpc] +# needs: ["build:nmodl"] +# variables: +# SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit+nmodl~openmp+shared+sympy+tests~unified build_type=RelWithDebInfo build:coreneuron:nmodl:nvhpc:omp:legacy: extends: [.build_coreneuron, .spack_nvhpc] needs: ["build:nmodl"] variables: - SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit+nmodl+openmp~shared~sympy+tests~unified build_type=RelWithDebInfo + SPACK_PACKAGE_SPEC: ~caliper+gpu~legacy-unit+nmodl+openmp~shared~sympy+tests~unified build_type=RelWithDebInfo build:coreneuron:nmodl:nvhpc:omp:debug: extends: [.build_coreneuron, .spack_nvhpc] needs: ["build:nmodl"] variables: - SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit+nmodl+openmp~shared+sympy+tests~unified build_type=Debug + SPACK_PACKAGE_SPEC: ~caliper+gpu~legacy-unit+nmodl+openmp~shared+sympy+tests~unified build_type=Debug # Build NEURON -build:neuron:mod2c:intel:shared:debug: - extends: [.build_neuron, .spack_intel] - needs: ["build:coreneuron:mod2c:intel:shared:debug"] - -build:neuron:nmodl:intel:debug:legacy: - extends: [.build_neuron, .spack_intel] - needs: ["build:coreneuron:nmodl:intel:debug:legacy"] - -build:neuron:nmodl:intel:shared:debug: - extends: [.build_neuron, .spack_intel] - needs: ["build:coreneuron:nmodl:intel:shared:debug"] - -build:neuron:mod2c:nvhpc:acc:shared: - extends: [.build_neuron, .spack_nvhpc] - needs: ["build:coreneuron:mod2c:nvhpc:acc:shared"] - -build:neuron:nmodl:nvhpc:acc:debug:legacy: - extends: [.build_neuron, .spack_nvhpc] - needs: ["build:coreneuron:nmodl:nvhpc:acc:debug:legacy"] - -build:neuron:nmodl:nvhpc:acc:shared: - extends: [.build_neuron, .spack_nvhpc] - needs: ["build:coreneuron:nmodl:nvhpc:acc:shared"] +#build:neuron:mod2c:intel:shared:debug: +# extends: [.build_neuron, .spack_intel] +# needs: ["build:coreneuron:mod2c:intel:shared:debug"] +# +#build:neuron:nmodl:intel:debug:legacy: +# extends: [.build_neuron, .spack_intel] +# needs: ["build:coreneuron:nmodl:intel:debug:legacy"] +# +#build:neuron:nmodl:intel:shared:debug: +# extends: [.build_neuron, .spack_intel] +# needs: ["build:coreneuron:nmodl:intel:shared:debug"] +# +#build:neuron:mod2c:nvhpc:acc:shared: +# extends: [.build_neuron, .spack_nvhpc] +# needs: ["build:coreneuron:mod2c:nvhpc:acc:shared"] +# +#build:neuron:nmodl:nvhpc:acc:debug:legacy: +# extends: [.build_neuron, .spack_nvhpc] +# needs: ["build:coreneuron:nmodl:nvhpc:acc:debug:legacy"] +# +#build:neuron:nmodl:nvhpc:acc:shared: +# extends: [.build_neuron, .spack_nvhpc] +# needs: ["build:coreneuron:nmodl:nvhpc:acc:shared"] build:neuron:nmodl:nvhpc:omp:legacy: extends: [.build_neuron, .spack_nvhpc] @@ -190,33 +190,33 @@ build:neuron:nmodl:nvhpc:omp:debug: needs: ["build:coreneuron:nmodl:nvhpc:omp:debug"] # Test CoreNEURON -test:coreneuron:mod2c:intel:shared:debug: - extends: [.ctest] - needs: ["build:coreneuron:mod2c:intel:shared:debug"] - -test:coreneuron:nmodl:intel:debug:legacy: - extends: [.ctest] - needs: ["build:coreneuron:nmodl:intel:debug:legacy"] - -test:coreneuron:nmodl:intel:shared:debug: - extends: [.ctest] - needs: ["build:coreneuron:nmodl:intel:shared:debug"] - -test:coreneuron:mod2c:nvhpc:acc:debug:unified: - extends: [.ctest, .gpu_node] - needs: ["build:coreneuron:mod2c:nvhpc:acc:debug:unified"] - -test:coreneuron:mod2c:nvhpc:acc:shared: - extends: [.ctest, .gpu_node] - needs: ["build:coreneuron:mod2c:nvhpc:acc:shared"] - -test:coreneuron:nmodl:nvhpc:acc:debug:legacy: - extends: [.ctest, .gpu_node] - needs: ["build:coreneuron:nmodl:nvhpc:acc:debug:legacy"] - -test:coreneuron:nmodl:nvhpc:acc:shared: - extends: [.ctest, .gpu_node] - needs: ["build:coreneuron:nmodl:nvhpc:acc:shared"] +#test:coreneuron:mod2c:intel:shared:debug: +# extends: [.ctest] +# needs: ["build:coreneuron:mod2c:intel:shared:debug"] +# +#test:coreneuron:nmodl:intel:debug:legacy: +# extends: [.ctest] +# needs: ["build:coreneuron:nmodl:intel:debug:legacy"] +# +#test:coreneuron:nmodl:intel:shared:debug: +# extends: [.ctest] +# needs: ["build:coreneuron:nmodl:intel:shared:debug"] +# +#test:coreneuron:mod2c:nvhpc:acc:debug:unified: +# extends: [.ctest, .gpu_node] +# needs: ["build:coreneuron:mod2c:nvhpc:acc:debug:unified"] +# +#test:coreneuron:mod2c:nvhpc:acc:shared: +# extends: [.ctest, .gpu_node] +# needs: ["build:coreneuron:mod2c:nvhpc:acc:shared"] +# +#test:coreneuron:nmodl:nvhpc:acc:debug:legacy: +# extends: [.ctest, .gpu_node] +# needs: ["build:coreneuron:nmodl:nvhpc:acc:debug:legacy"] +# +#test:coreneuron:nmodl:nvhpc:acc:shared: +# extends: [.ctest, .gpu_node] +# needs: ["build:coreneuron:nmodl:nvhpc:acc:shared"] test:coreneuron:nmodl:nvhpc:omp:legacy: extends: [.ctest, .gpu_node] @@ -227,29 +227,29 @@ test:coreneuron:nmodl:nvhpc:omp:debug: needs: ["build:coreneuron:nmodl:nvhpc:omp:debug"] # Test NEURON -test:neuron:mod2c:intel:shared:debug: - extends: [.test_neuron] - needs: ["build:neuron:mod2c:intel:shared:debug"] - -test:neuron:nmodl:intel:debug:legacy: - extends: [.test_neuron] - needs: ["build:neuron:nmodl:intel:debug:legacy"] - -test:neuron:nmodl:intel:shared:debug: - extends: [.test_neuron] - needs: ["build:neuron:nmodl:intel:shared:debug"] - -test:neuron:mod2c:nvhpc:acc:shared: - extends: [.test_neuron, .gpu_node] - needs: ["build:neuron:mod2c:nvhpc:acc:shared"] - -test:neuron:nmodl:nvhpc:acc:debug:legacy: - extends: [.test_neuron, .gpu_node] - needs: ["build:neuron:nmodl:nvhpc:acc:debug:legacy"] - -test:neuron:nmodl:nvhpc:acc:shared: - extends: [.test_neuron, .gpu_node] - needs: ["build:neuron:nmodl:nvhpc:acc:shared"] +#test:neuron:mod2c:intel:shared:debug: +# extends: [.test_neuron] +# needs: ["build:neuron:mod2c:intel:shared:debug"] +# +#test:neuron:nmodl:intel:debug:legacy: +# extends: [.test_neuron] +# needs: ["build:neuron:nmodl:intel:debug:legacy"] +# +#test:neuron:nmodl:intel:shared:debug: +# extends: [.test_neuron] +# needs: ["build:neuron:nmodl:intel:shared:debug"] +# +#test:neuron:mod2c:nvhpc:acc:shared: +# extends: [.test_neuron, .gpu_node] +# needs: ["build:neuron:mod2c:nvhpc:acc:shared"] +# +#test:neuron:nmodl:nvhpc:acc:debug:legacy: +# extends: [.test_neuron, .gpu_node] +# needs: ["build:neuron:nmodl:nvhpc:acc:debug:legacy"] +# +#test:neuron:nmodl:nvhpc:acc:shared: +# extends: [.test_neuron, .gpu_node] +# needs: ["build:neuron:nmodl:nvhpc:acc:shared"] test:neuron:nmodl:nvhpc:omp:legacy: extends: [.test_neuron, .gpu_node]