From a1b25dec48b837646fc5dfb35704dc85321cd51c Mon Sep 17 00:00:00 2001 From: CamStan Date: Tue, 25 Jun 2024 15:11:45 -0700 Subject: [PATCH] Incremental release v0.4.0 Update verison number in CMakeLists.txt and scr/rankstr_mpi.h Remove old cmake version restriction and add id_token to simply get gitlab ci to run again --- .gitlab-ci.yml | 5 +++-- CMakeLists.txt | 2 +- src/rankstr_mpi.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2aa0351..c179491 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +include: + - project: 'lc-templates/id_tokens' + file: 'id_tokens.yml' slurm-job: tags: - quartz @@ -5,7 +8,6 @@ slurm-job: variables: LLNL_SLURM_SCHEDULER_PARAMETERS: "-N 3 -p pbatch" script: - - module load cmake/3.9.2 - cmake -DMPI=ON -DVELOC_RESOURCE_MANAGER=SLURM - make VERBOSE=1 - make check @@ -16,7 +18,6 @@ lsf-job: variables: LLNL_LSF_SCHEDULER_PARAMETERS: "-nnodes 3 -q pbatch" script: - - module load cmake/3.9.2 - cmake -DMPI=ON -DVELOC_RESOURCE_MANAGER=LSF - make VERBOSE=1 - make check diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fce588..2a36d45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.14) -PROJECT(RANKSTR VERSION 0.3.0) +PROJECT(RANKSTR VERSION 0.4.0) # Mac rpath Policy IF(POLICY CMP0042) diff --git a/src/rankstr_mpi.h b/src/rankstr_mpi.h index dcc3306..4b8e5f4 100644 --- a/src/rankstr_mpi.h +++ b/src/rankstr_mpi.h @@ -21,7 +21,7 @@ extern "C" { #endif -#define RANKSTR_VERSION "0.3.0" +#define RANKSTR_VERSION "0.4.0" /** Given a communicator and a string, compute number of unique strings * across all procs in comm and compute an id for input string