diff --git a/.github/workflows/clang_cmake_format_check.yaml b/.github/workflows/clang_cmake_format_check.yaml deleted file mode 100644 index b438a8080..000000000 --- a/.github/workflows/clang_cmake_format_check.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: clang-cmake-format-check - -concurrency: - group: ${{ github.workflow }}#${{ github.ref }} - cancel-in-progress: true - -on: - push: - -jobs: - build: - name: clang-cmake-format-check - runs-on: ubuntu-20.04 - steps: - - name: Fetch repository - uses: actions/checkout@v2 - - name: Install clang-format 11 - run: | - sudo apt-get update - sudo apt-get install clang-format-11 python3-pip libboost-all-dev libopenmpi-dev openmpi-bin - - name: Install cmake-format 0.6.13 - run: python3 -m pip install cmake-format==0.6.13 - - name: Configure - shell: bash - working-directory: ${{runner.workspace}}/CoreNeuron - run: | - export PATH=/home/runner/.local/bin:$PATH - mkdir BUILD && cd BUILD - cmake -DCORENRN_CLANG_FORMAT=ON -DCORENRN_CMAKE_FORMAT=ON -DCORENRN_ENABLE_MPI=ON -DCORENRN_ENABLE_OPENMP=OFF -DClangFormat_EXECUTABLE=$(which clang-format-11) -DCMakeFormat_EXECUTABLE=$(which cmake-format) .. - - name: Run clang-format - shell: bash - working-directory: ${{runner.workspace}}/CoreNeuron/BUILD - run: make check-clang-format VERBOSE=1 - - name: Run cmake-format - shell: bash - working-directory: ${{runner.workspace}}/CoreNeuron/BUILD - run: make check-cmake-format diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e3967f7d..1d89f8eca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,9 +35,6 @@ spack_setup: - git diff - fi -.spack_intel: - variables: - SPACK_PACKAGE_COMPILER: intel .spack_nvhpc: variables: SPACK_PACKAGE_COMPILER: nvhpc @@ -50,16 +47,6 @@ spack_setup: variables: bb5_constraint: volta -build:nmodl:intel: - stage: build_nmodl - variables: - SPACK_PACKAGE: nmodl - SPACK_PACKAGE_REF: '' - SPACK_PACKAGE_SPEC: ~legacy-unit - extends: - - .spack_build - - .spack_intel - build:nmodl:gpu: stage: build_nmodl variables: @@ -71,23 +58,6 @@ build:nmodl:gpu: - .spack_build - .spack_nvhpc -build:coreneuron+nmodl:intel: - variables: - SPACK_PACKAGE: coreneuron - SPACK_PACKAGE_SPEC: +nmodl+tests~legacy-unit build_type=Debug - extends: - - .spack_build - - .spack_intel - needs: ["build:nmodl:intel"] - -build:coreneuron:intel: - variables: - SPACK_PACKAGE: coreneuron - SPACK_PACKAGE_SPEC: +tests~legacy-unit build_type=Debug - extends: - - .spack_build - - .spack_intel - build:coreneuron+nmodl:gpu: variables: SPACK_PACKAGE: coreneuron @@ -99,48 +69,10 @@ build:coreneuron+nmodl:gpu: - .spack_nvhpc needs: ["build:nmodl:gpu"] -build:coreneuron:gpu: - variables: - SPACK_PACKAGE: coreneuron - # +report pulls in a lot of dependencies and the tests fail. - # See https://github.com/BlueBrain/CoreNeuron/issues/518 re: build_type - SPACK_PACKAGE_SPEC: +gpu+tests~legacy-unit~report build_type=RelWithDebInfo - extends: - - .spack_build - - .spack_nvhpc - -test:coreneuron+nmodl:intel: - extends: [.ctest] - needs: ["build:coreneuron+nmodl:intel"] - -test:coreneuron:intel: - extends: [.ctest] - needs: ["build:coreneuron:intel"] - test:coreneuron+nmodl:gpu: extends: [.ctest, .gpu_node] needs: ["build:coreneuron+nmodl:gpu"] -test:coreneuron:gpu: - extends: [.ctest, .gpu_node] - needs: ["build:coreneuron:gpu"] - -build:neuron+nmodl:intel: - stage: build_neuron - extends: - - .spack_build - - .spack_neuron - - .spack_intel - needs: ["build:coreneuron+nmodl:intel"] - -build:neuron:intel: - stage: build_neuron - extends: - - .spack_build - - .spack_neuron - - .spack_intel - needs: ["build:coreneuron:intel"] - build:neuron+nmodl:gpu: stage: build_neuron extends: @@ -153,34 +85,7 @@ build:neuron+nmodl:gpu: - !reference [.spack_build, before_script] needs: ["build:coreneuron+nmodl:gpu"] -build:neuron:gpu: - stage: build_neuron - extends: - - .spack_build - - .spack_neuron - - .spack_nvhpc - before_script: - # Build py-cython and py-numpy with GCC instead of NVHPC. - - SPACK_PACKAGE_DEPENDENCIES="${SPACK_PACKAGE_DEPENDENCIES}^py-cython%gcc^py-numpy%gcc" - - !reference [.spack_build, before_script] - needs: ["build:coreneuron:gpu"] - -test:neuron+nmodl:intel: - stage: test_neuron - extends: [.ctest] - needs: ["build:neuron+nmodl:intel"] - -test:neuron:intel: - stage: test_neuron - extends: [.ctest] - needs: ["build:neuron:intel"] - test:neuron+nmodl:gpu: stage: test_neuron extends: [.ctest, .gpu_node] needs: ["build:neuron+nmodl:gpu"] - -test:neuron:gpu: - stage: test_neuron - extends: [.ctest, .gpu_node] - needs: ["build:neuron:gpu"]