From 48fba29a8a2ce5faaa507e67a757a26d9360f5ef Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Wed, 17 Mar 2021 10:19:58 -0600 Subject: [PATCH 1/2] add gitlab ci yml scripts for lanl systems and for jlse if it one day supportx external mirroring Signed-off-by: Howard Pritchard --- .ci/lanl/README.md | 16 +++++ .ci/lanl/gitlab-ci-darwin.yml | 109 ++++++++++++++++++++++++++++++++++ .ci/lanl/gitlab-ci-jlse.yml | 109 ++++++++++++++++++++++++++++++++++ 3 files changed, 234 insertions(+) create mode 100644 .ci/lanl/README.md create mode 100644 .ci/lanl/gitlab-ci-darwin.yml create mode 100644 .ci/lanl/gitlab-ci-jlse.yml diff --git a/.ci/lanl/README.md b/.ci/lanl/README.md new file mode 100644 index 00000000000..37734de6c50 --- /dev/null +++ b/.ci/lanl/README.md @@ -0,0 +1,16 @@ +ECP-CI at OLCF +-------------- +#[![pipeline status](https://code.ornl.gov/ecpcitest/ompi-x/naughtont3-ompi/badges/olcf-ecp-ci/pipeline.svg)](https://code.ornl.gov/ecpcitest/ompi-x/naughtont3-ompi/-/commits/olcf-ecp-ci) + +CI Tests that run on LANL resources. + +Brief summary: + - OMPI GitHub mirrored at LANL GitLab + - Builds source tree + - autogen, configure, make install, make check, make examples + - Runs tests in batch allocation with single node + - The CI status/results are reported back to GitHub via a python script (`build-status.py`) + - See also: https://ecp-ci.gitlab.io/docs/guides/build-status-gitlab.html + - Note: The `BUILDSTATUS_TOKEN` is defined in GitLab and contains a + personal access token (`repo:status`) for the upstream GitHub user. + diff --git a/.ci/lanl/gitlab-ci-darwin.yml b/.ci/lanl/gitlab-ci-darwin.yml new file mode 100644 index 00000000000..3f0370df6e9 --- /dev/null +++ b/.ci/lanl/gitlab-ci-darwin.yml @@ -0,0 +1,109 @@ +stages: + - build + - test + +build:intel: + stage: build + tags: [darwin-slurm] + script: + - module load intel + - git submodule update --init + - ./autogen.pl + - ./configure CC=icc FC=ifort CXX=icpc --prefix=$PWD/install_test --with-libevent=internal + - make -j 8 install + - make check + - export PATH=$PWD/install_test/bin:$PATH + - cd examples + - make + variables: + SCHEDULER_PARAMETERS: "-pskylake-gold -t 1:00:00 -N 1 --ntasks-per-node=16" + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + untracked: true + paths: + - examples + - install_test + expire_in: 1 week + +build:gnu: + stage: build + tags: [darwin-slurm] + script: + - module load gcc + - git submodule update --init + - ./autogen.pl + - ./configure --prefix=$PWD/install_test --with-libevent=internal + - make -j 8 install + - make check + - export PATH=$PWD/install_test/bin:$PATH + - cd examples + - make + variables: + SCHEDULER_PARAMETERS: "-pskylake-gold -t 1:00:00 -N 1 --ntasks-per-node=16" + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + untracked: true + paths: + - examples + - install_test + expire_in: 1 week + +test:intel: + stage: test + tags: [darwin-slurm] + dependencies: + - build:intel + needs: ["build:intel"] + script: + - pwd + - ls + - module load intel + - export PATH=$PWD/install_test/bin:$PATH + - which mpirun + - cd examples + - mpirun -np 4 hostname + - mpirun -np 4 ./hello_c + - mpirun -np 4 ./ring_c + - mpirun -np 4 ./hello_mpifh + - mpirun -np 4 ./ring_mpifh + - mpirun -np 4 ./hello_usempi + - mpirun -np 4 ./ring_usempi + - mpirun -np 4 ./hello_usempif08 + - mpirun -np 4 ./ring_usempif08 + - mpirun -np 4 ./connectivity_c + variables: + SCHEDULER_PARAMETERS: "-pskylake-gold -t 1:00:00 -N 1 --ntasks-per-node=16" + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + expire_in: 1 week + +test:gnu: + stage: test + tags: [dawrin-slurm] + dependencies: + - build:gnu + needs: ["build:gnu"] + script: + - pwd + - ls + - module load gcc + - export PATH=$PWD/install_test/bin:$PATH + - which mpirun + - cd examples + - mpirun -np 4 hostname + - mpirun -np 4 ./hello_c + - mpirun -np 4 ./ring_c + - mpirun -np 4 ./hello_mpifh + - mpirun -np 4 ./ring_mpifh + - mpirun -np 4 ./hello_usempi + - mpirun -np 4 ./ring_usempi + - mpirun -np 4 ./hello_usempif08 + - mpirun -np 4 ./ring_usempif08 + - mpirun -np 4 ./connectivity_c + variables: + SCHEDULER_PARAMETERS: "-pskylake-gold -t 1:00:00 -N 1 --ntasks-per-node=16" + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + expire_in: 1 week + + diff --git a/.ci/lanl/gitlab-ci-jlse.yml b/.ci/lanl/gitlab-ci-jlse.yml new file mode 100644 index 00000000000..d9c0e0f2157 --- /dev/null +++ b/.ci/lanl/gitlab-ci-jlse.yml @@ -0,0 +1,109 @@ +stages: + - build + - test + +build:intel: + stage: build + tags: [jlselogin3_shell] + script: + - module load intel + - git submodule update --init + - ./autogen.pl + - ./configure CC=icc FC=ifort CXX=icpc --prefix=$PWD/install_test --with-libevent=internal + - make -j 8 install + - make check + - export PATH=$PWD/install_test/bin:$PATH + - cd examples + - make + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME_intel" + untracked: true + paths: + - examples + - install_test + expire_in: 1 week + only: [merge_requests] + +build:gnu: + stage: build + tags: [jlselogin3_shell] + script: + - module load gcc + - git submodule update --init + - ./autogen.pl + - ./configure --prefix=$PWD/install_test --with-libevent=internal + - make -j 8 install + - make check + - export PATH=$PWD/install_test/bin:$PATH + - cd examples + - make + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + untracked: true + paths: + - examples + - install_test + expire_in: 1 week + only: [merge_requests] + +test:intel: + stage: test + tags: + - jlselogin3_batch-03 + dependencies: + - build:intel + needs: ["build:intel"] + script: + - pwd + - ls + - module load intel + - export PATH=$PWD/install_test/bin:$PATH + - which mpirun + - cd examples + - mpirun -np 4 hostname + - mpirun -np 4 ./hello_c + - mpirun -np 4 ./ring_c + - mpirun -np 4 ./hello_mpifh + - mpirun -np 4 ./ring_mpifh + - mpirun -np 4 ./hello_usempi + - mpirun -np 4 ./ring_usempi + - mpirun -np 4 ./hello_usempif08 + - mpirun -np 4 ./ring_usempif08 + - mpirun -np 4 ./connectivity_c + variables: + JLSE_SCHEDULER_PARAMETERS: "-qiris -t 1:00:00 -n 1" + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + expire_in: 1 week + only: [merge_requests] + +test:gnu: + stage: test + tags: + - jlselogin3_batch-03 + dependencies: + - build:gnu + needs: ["build:gnu"] + script: + - pwd + - ls + - module load gcc + - export PATH=$PWD/install_test/bin:$PATH + - which mpirun + - cd examples + - mpirun -np 4 hostname + - mpirun -np 4 ./hello_c + - mpirun -np 4 ./ring_c + - mpirun -np 4 ./hello_mpifh + - mpirun -np 4 ./ring_mpifh + - mpirun -np 4 ./hello_usempi + - mpirun -np 4 ./ring_usempi + - mpirun -np 4 ./hello_usempif08 + - mpirun -np 4 ./ring_usempif08 + - mpirun -np 4 ./connectivity_c + variables: + JLSE_SCHEDULER_PARAMETERS: "-qiris -t 1:00:00 -n 1" + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + expire_in: 1 week + only: [merge_requests] From 5553b06cd1248f104794533954c9594ae659c651 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Wed, 17 Mar 2021 10:30:00 -0600 Subject: [PATCH 2/2] test of re-git ci at lanl Signed-off-by: Howard Pritchard --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index fe089b84f87..8fdec9c9c9b 100644 --- a/NEWS +++ b/NEWS @@ -75,6 +75,8 @@ Master (not on release branches yet) * launcher. ********************************************************************** +lets add some news here + - Fix rank-by algorithms to properly rank by object and span - Do not build Open SHMEM layer when there are no SPMLs available. Currently, this means the Open SHMEM layer will only build if