From c4368f6230d34931af0ff60ff8f16c1621987a36 Mon Sep 17 00:00:00 2001 From: mtar Date: Mon, 26 Sep 2022 12:50:27 +0200 Subject: [PATCH 01/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10a3b4f889..47133bfb7e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,19 +1,20 @@ test: - image: ubuntu:20.04 + image: nvidia/cuda tags: - - heat + - cuda + - x86_64 script: - - apt update - - apt -y install build-essential python3-pip curl - - DEBIAN_FRONTEND=noninteractive apt -y install libopenmpi-dev openmpi-bin openmpi-doc - - apt -y install libhdf5-openmpi-dev libpnetcdf-dev - - pip install pytest coverage - - pip install .[hdf5,netcdf] - - COVERAGE_FILE=report/cov/coverage1 mpirun --allow-run-as-root -n 1 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report1.xml heat/ - - COVERAGE_FILE=report/cov/coverage2 mpirun --allow-run-as-root -n 3 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report2.xml heat/ - - COVERAGE_FILE=report/cov/coverage5 mpirun --allow-run-as-root -n 5 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report5.xml heat/ - - COVERAGE_FILE=report/cov/coverage8 mpirun --allow-run-as-root -n 8 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report8.xml heat/ - - coverage combine report/cov/* - - coverage report - - coverage xml - - curl -s https://codecov.io/bash | bash -s -- -c -F unit -f coverage.xml -t $CODECOV_TOKEN || echo "Codecov failed to upload" + - apt update + - apt -y install build-essential python3-pip curl + - DEBIAN_FRONTEND=noninteractive apt -y install libopenmpi-dev openmpi-bin openmpi-doc + - apt -y install libhdf5-openmpi-dev libpnetcdf-dev + - pip install pytest coverage + - pip install .[hdf5,netcdf] + - COVERAGE_FILE=report/cov/coverage1 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 1 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report1.xml heat/ + - COVERAGE_FILE=report/cov/coverage2 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 3 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report2.xml heat/ + - COVERAGE_FILE=report/cov/coverage5 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 5 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report5.xml heat/ + - COVERAGE_FILE=report/cov/coverage8 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 8 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report8.xml heat/ + - coverage combine report/cov/* + - coverage report + - coverage xml + - curl -s https://codecov.io/bash | bash -s -- -c -F unit -f coverage.xml -t $CODECOV_TOKEN || echo "Codecov failed to upload" From 6ec460e7e50c19a4cce9b7159b5b2f467dcf0e17 Mon Sep 17 00:00:00 2001 From: mtar Date: Mon, 26 Sep 2022 12:54:02 +0200 Subject: [PATCH 02/21] Update ci_cpu.yml --- .github/workflows/ci_cpu.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_cpu.yml b/.github/workflows/ci_cpu.yml index 312abbcf13..a8b3f2efa7 100644 --- a/.github/workflows/ci_cpu.yml +++ b/.github/workflows/ci_cpu.yml @@ -10,11 +10,11 @@ jobs: - name: Mirror + trigger CI uses: SvanBoxel/gitlab-mirror-and-ci-action@master with: - args: "https://gitlab.jsc.fz-juelich.de/haf/heat" + args: "https://gitlab.hzdr.de/haf/heat" env: FORCE_PUSH: "true" - GITLAB_HOSTNAME: "gitlab.jsc.fz-juelich.de" + GITLAB_HOSTNAME: "gitlab.hzdr.de" GITLAB_USERNAME: "" - GITLAB_PASSWORD: ${{ secrets.GITLAB_TOKEN }} - GITLAB_PROJECT_ID: "4935" + GITLAB_PASSWORD: ${{ secrets.GITLAB_TOKEN_1 }} + GITLAB_PROJECT_ID: "845" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From fea249dbec4ac905aaab0024cac94eb1272ceef3 Mon Sep 17 00:00:00 2001 From: mtar Date: Mon, 26 Sep 2022 13:07:01 +0200 Subject: [PATCH 03/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47133bfb7e..589c4ba304 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ test: - image: nvidia/cuda + image: nvidia/cuda:11.7.1-runtime-ubuntu22.04 tags: - cuda - x86_64 From 6bfc78bb77a3d87e0a9b3570db35023a83d81bf0 Mon Sep 17 00:00:00 2001 From: mtar Date: Mon, 26 Sep 2022 13:10:06 +0200 Subject: [PATCH 04/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 589c4ba304..bc0b131a95 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ test: - image: nvidia/cuda:11.7.1-runtime-ubuntu22.04 + image: nvidia/cuda:11.7.1-runtime-ubuntu20.04 tags: - cuda - x86_64 From 290ca30e547c6060cafb4addbdbc2f294cafb4d9 Mon Sep 17 00:00:00 2001 From: mtar Date: Mon, 26 Sep 2022 13:15:38 +0200 Subject: [PATCH 05/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc0b131a95..7dc24f09b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ test: - image: nvidia/cuda:11.7.1-runtime-ubuntu20.04 + image: nvidia/cuda:11.6.2-runtime-ubuntu20.04 tags: - cuda - x86_64 From 66a31dce2852c1a014cff32918ada4c8be14921e Mon Sep 17 00:00:00 2001 From: mtar Date: Mon, 26 Sep 2022 13:53:46 +0200 Subject: [PATCH 06/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7dc24f09b9..2eb92e15c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ test: - DEBIAN_FRONTEND=noninteractive apt -y install libopenmpi-dev openmpi-bin openmpi-doc - apt -y install libhdf5-openmpi-dev libpnetcdf-dev - pip install pytest coverage + - pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu116 - pip install .[hdf5,netcdf] - COVERAGE_FILE=report/cov/coverage1 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 1 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report1.xml heat/ - COVERAGE_FILE=report/cov/coverage2 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 3 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report2.xml heat/ From d1996ac00b95580dba10e98eb722eb7d0f188970 Mon Sep 17 00:00:00 2001 From: mtar Date: Mon, 26 Sep 2022 14:08:44 +0200 Subject: [PATCH 07/21] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5aaea7ff3e..28106f612b 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ install_requires=[ "mpi4py>=3.0.0", "numpy>=1.13.0", - "torch>=1.7.0, <=1.12.1", + "torch>=1.7.0, <=1.12.1*", "scipy>=0.14.0", "pillow>=6.0.0", "torchvision>=0.8.0", From 46bcca5eaa3638b851e7dae1c0342c07fc104772 Mon Sep 17 00:00:00 2001 From: mtar Date: Mon, 26 Sep 2022 14:56:27 +0200 Subject: [PATCH 08/21] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 28106f612b..dad23ede13 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ install_requires=[ "mpi4py>=3.0.0", "numpy>=1.13.0", - "torch>=1.7.0, <=1.12.1*", + "torch>=1.7.0", "scipy>=0.14.0", "pillow>=6.0.0", "torchvision>=0.8.0", From ee82d533f51f6a8413b77ddaf6122bd013795b47 Mon Sep 17 00:00:00 2001 From: mtar Date: Mon, 26 Sep 2022 16:02:18 +0200 Subject: [PATCH 09/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2eb92e15c6..0ce2e26033 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,10 +11,10 @@ test: - pip install pytest coverage - pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu116 - pip install .[hdf5,netcdf] - - COVERAGE_FILE=report/cov/coverage1 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 1 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report1.xml heat/ - - COVERAGE_FILE=report/cov/coverage2 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 3 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report2.xml heat/ - - COVERAGE_FILE=report/cov/coverage5 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 5 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report5.xml heat/ - - COVERAGE_FILE=report/cov/coverage8 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 8 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report8.xml heat/ + - COVERAGE_FILE=report/cov/coverage1 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 1 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report1.xml heat/ + - COVERAGE_FILE=report/cov/coverage2 HEAT_TEST_USE_DEVICE=ccpu mpirun --allow-run-as-root -n 3 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report2.xml heat/ + - COVERAGE_FILE=report/cov/coverage5 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 5 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report5.xml heat/ + - COVERAGE_FILE=report/cov/coverage8 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 8 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report8.xml heat/ - coverage combine report/cov/* - coverage report - coverage xml From 1b0bf5543abda564c729de0bb56f51ad1aa43245 Mon Sep 17 00:00:00 2001 From: mtar Date: Mon, 26 Sep 2022 16:09:33 +0200 Subject: [PATCH 10/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ce2e26033..35cfc19a58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ test: - pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu116 - pip install .[hdf5,netcdf] - COVERAGE_FILE=report/cov/coverage1 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 1 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report1.xml heat/ - - COVERAGE_FILE=report/cov/coverage2 HEAT_TEST_USE_DEVICE=ccpu mpirun --allow-run-as-root -n 3 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report2.xml heat/ + - COVERAGE_FILE=report/cov/coverage2 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 3 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report2.xml heat/ - COVERAGE_FILE=report/cov/coverage5 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 5 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report5.xml heat/ - COVERAGE_FILE=report/cov/coverage8 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 8 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report8.xml heat/ - coverage combine report/cov/* From 6c4e04ad378d6eae7eff0951ceeecc453dbd54e7 Mon Sep 17 00:00:00 2001 From: mtar Date: Tue, 27 Sep 2022 10:17:00 +0200 Subject: [PATCH 11/21] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index dad23ede13..e97991ec3b 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ install_requires=[ "mpi4py>=3.0.0", "numpy>=1.13.0", - "torch>=1.7.0", + "torch>=1.7.0, <1.13", "scipy>=0.14.0", "pillow>=6.0.0", "torchvision>=0.8.0", From 656c90e249b15cdfc6a375a7940ea9680e270b39 Mon Sep 17 00:00:00 2001 From: mtar Date: Wed, 28 Sep 2022 15:26:55 +0200 Subject: [PATCH 12/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35cfc19a58..e5a314d740 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,9 @@ test: - pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu116 - pip install .[hdf5,netcdf] - COVERAGE_FILE=report/cov/coverage1 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 1 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report1.xml heat/ - - COVERAGE_FILE=report/cov/coverage2 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 3 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report2.xml heat/ + - COVERAGE_FILE=report/cov/coverage2 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 3 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report2.xml heat/ - COVERAGE_FILE=report/cov/coverage5 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 5 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report5.xml heat/ - - COVERAGE_FILE=report/cov/coverage8 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 8 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report8.xml heat/ + - COVERAGE_FILE=report/cov/coverage8 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 7 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report8.xml heat/ - coverage combine report/cov/* - coverage report - coverage xml From c1eb4d5b148219401fc452c7d7dc72a7e779a6b4 Mon Sep 17 00:00:00 2001 From: mtar Date: Wed, 28 Sep 2022 15:45:33 +0200 Subject: [PATCH 13/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5a314d740..096b6217a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,10 +12,20 @@ test: - pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu116 - pip install .[hdf5,netcdf] - COVERAGE_FILE=report/cov/coverage1 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 1 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report1.xml heat/ - - COVERAGE_FILE=report/cov/coverage2 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 3 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report2.xml heat/ + - COVERAGE_FILE=report/cov/coverage2 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 3 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report3.xml heat/ - COVERAGE_FILE=report/cov/coverage5 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 5 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report5.xml heat/ - - COVERAGE_FILE=report/cov/coverage8 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 7 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report8.xml heat/ + - COVERAGE_FILE=report/cov/coverage8 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 7 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report7.xml heat/ - coverage combine report/cov/* - coverage report - coverage xml - curl -s https://codecov.io/bash | bash -s -- -c -F unit -f coverage.xml -t $CODECOV_TOKEN || echo "Codecov failed to upload" + artifacts: + when: always + paths: + - report/test/ + reports: + junit: + - report1.xml + - report3.xml + - report5.xml + - report7.xml From b72f76d59b59fa6ad1a76cc3ef2915d41c624260 Mon Sep 17 00:00:00 2001 From: mtar Date: Wed, 28 Sep 2022 16:19:01 +0200 Subject: [PATCH 14/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 096b6217a8..e1f32da538 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ test: - COVERAGE_FILE=report/cov/coverage1 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 1 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report1.xml heat/ - COVERAGE_FILE=report/cov/coverage2 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 3 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report3.xml heat/ - COVERAGE_FILE=report/cov/coverage5 HEAT_TEST_USE_DEVICE=cpu mpirun --allow-run-as-root -n 5 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report5.xml heat/ - - COVERAGE_FILE=report/cov/coverage8 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 7 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report7.xml heat/ + - COVERAGE_FILE=report/cov/coverage8 HEAT_TEST_USE_DEVICE=gpu mpirun --allow-run-as-root -n 6 coverage run --source=heat --parallel-mode -m pytest --junitxml=report/test/report6.xml heat/ - coverage combine report/cov/* - coverage report - coverage xml @@ -22,10 +22,6 @@ test: artifacts: when: always paths: - - report/test/ + - report/test/report*.xml reports: - junit: - - report1.xml - - report3.xml - - report5.xml - - report7.xml + junit: report*.xml From 6a2de4d298ee985f23cdca2039adfd062e03d8a0 Mon Sep 17 00:00:00 2001 From: mtar Date: Wed, 28 Sep 2022 16:20:24 +0200 Subject: [PATCH 15/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1f32da538..ad9b691cd9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,4 +24,4 @@ test: paths: - report/test/report*.xml reports: - junit: report*.xml + junit: report/test/report*.xml From 14c6fba258c37a1627294e453d7cb7302f8091ec Mon Sep 17 00:00:00 2001 From: mtar Date: Wed, 28 Sep 2022 16:35:31 +0200 Subject: [PATCH 16/21] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 267787f455..5185637281 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -50,6 +50,3 @@ my be illegible. It may be easiest to save the output of each to a file. #### Does this change modify the behaviour of other functions? If so, which? yes / no - - -skip ci From 41bb6fc7abe09010507c196c90ff0cb506b50432 Mon Sep 17 00:00:00 2001 From: mtar Date: Fri, 30 Sep 2022 13:52:34 +0200 Subject: [PATCH 17/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad9b691cd9..1bf385c707 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,9 @@ test: - coverage combine report/cov/* - coverage report - coverage xml - - curl -s https://codecov.io/bash | bash -s -- -c -F unit -f coverage.xml -t $CODECOV_TOKEN || echo "Codecov failed to upload" + - curl -Os https://uploader.codecov.io/latest/linux/codecov + - chmod +x codecov + - ./codecov -f coverage.xml -Z -t $CODECOV_TOKEN -F unit artifacts: when: always paths: From 00ea6e48b86deb30445eb2cc4da61ddb94596440 Mon Sep 17 00:00:00 2001 From: mtar Date: Fri, 30 Sep 2022 15:48:40 +0200 Subject: [PATCH 18/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1bf385c707..a10198c384 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ test: - coverage xml - curl -Os https://uploader.codecov.io/latest/linux/codecov - chmod +x codecov - - ./codecov -f coverage.xml -Z -t $CODECOV_TOKEN -F unit + - ./codecov -F unit -f ./coverage.xml -t $CODECOV_TOKEN -Z artifacts: when: always paths: From 5d74d72deb8639b61d12c3603e3d88f82118718e Mon Sep 17 00:00:00 2001 From: mtar Date: Fri, 30 Sep 2022 16:08:32 +0200 Subject: [PATCH 19/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a10198c384..822a501a9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ test: - x86_64 script: - apt update - - apt -y install build-essential python3-pip curl + - apt -y install build-essential python3-pip curl git - DEBIAN_FRONTEND=noninteractive apt -y install libopenmpi-dev openmpi-bin openmpi-doc - apt -y install libhdf5-openmpi-dev libpnetcdf-dev - pip install pytest coverage From 2823661d2fb58a5385261b9feffbf1995b03650f Mon Sep 17 00:00:00 2001 From: mtar Date: Wed, 5 Oct 2022 14:40:21 +0200 Subject: [PATCH 20/21] Update codecov.yml --- codecov.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/codecov.yml b/codecov.yml index 6ea47e1bf2..95cd8ab0a5 100644 --- a/codecov.yml +++ b/codecov.yml @@ -13,28 +13,15 @@ coverage: # basic target: auto threshold: 3% - base: auto flags: - unit paths: - "heat" - # advanced settings - branches: - - main - if_ci_failed: error #success, failure, error, ignore - informational: false - only_pulls: false patch: default: # basic target: auto threshold: 3% - base: auto - # advanced - branches: - - main - if_ci_failed: error #success, failure, error, ignore - only_pulls: false flags: - "unit" paths: From 36b24e92b736fb67f6ff301c6ad5651a26d0e868 Mon Sep 17 00:00:00 2001 From: mtar Date: Wed, 5 Oct 2022 15:54:01 +0200 Subject: [PATCH 21/21] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ad5ebcfc35..fc2b53886e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Heat is a distributed tensor framework for high performance data analytics. Project Status -------------- -[![Mirror and run GitLab CI](https://github.com/helmholtz-analytics/heat/actions/workflows/ci_cpu.yml/badge.svg?branch=main)](https://github.com/helmholtz-analytics/heat/actions/workflows/ci_cpu.yml) +[![Mirror and run GitLab CI](https://github.com/helmholtz-analytics/heat/actions/workflows/ci_cpu.yml/badge.svg)](https://github.com/helmholtz-analytics/heat/actions/workflows/ci_cpu.yml) [![Documentation Status](https://readthedocs.org/projects/heat/badge/?version=latest)](https://heat.readthedocs.io/en/latest/?badge=latest) [![codecov](https://codecov.io/gh/helmholtz-analytics/heat/branch/main/graph/badge.svg)](https://codecov.io/gh/helmholtz-analytics/heat) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)