8000 Update version numbers for v3.1.0 release by CamStan · Pull Request #594 · LLNL/scr · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Update version numbers for v3.1.0 release #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Update version numbers for v3.1.0 release #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.14.5)
PROJECT(SCR VERSION 3.0.1)
PROJECT(SCR VERSION 3.1.0)

# Find Packages & Files
LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
Expand Down
24 changes: 12 additions & 12 deletions bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ mkdir -p install

cd deps

lwgrp=lwgrp-1.0.5
dtcmp=dtcmp-1.1.4
pdsh=pdsh-2.34
lwgrp=lwgrp-1.0.6
dtcmp=dtcmp-1.1.5
pdsh=pdsh-2.35
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did all of these sub-components change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a recent small release to lwgrp (I don't believe anything changed in terms of how it works).
Both DTCMP and pdsh had releases some time ago, but didn't get updated in bootstrap.


if [ ! -f ${lwgrp}.tar.gz ] ; then
wget https://github.com/LLNL/lwgrp/releases/download/v1.0.5/${lwgrp}.tar.gz
wget https://github.com/LLNL/lwgrp/releases/download/v1.0.6/${lwgrp}.tar.gz
fi
if [ ! -f ${dtcmp}.tar.gz ] ; then
wget https://github.com/LLNL/dtcmp/releases/download/v1.1.4/${dtcmp}.tar.gz
wget https://github.com/LLNL/dtcmp/releases/download/v1.1.5/${dtcmp}.tar.gz
fi
if [ ! -f ${pdsh}.tar.gz ] ; then
wget https://github.com/chaos/pdsh/releases/download/${pdsh}/${pdsh}.tar.gz
Expand Down Expand Up @@ -152,7 +152,7 @@ popd

pushd KVTree
if [ $build_dev -eq 0 ] ; then
git checkout v1.3.0
git checkout v1.5.0
fi
rm -rf build
mkdir -p build
Expand All @@ -174,7 +174,7 @@ popd

pushd AXL
if [ $build_dev -eq 0 ] ; then
git checkout v0.6.0
git checkout v0.9.0
fi
rm -rf build
mkdir -p build
Expand All @@ -196,7 +196,7 @@ popd

pushd spath
if [ $build_dev -eq 0 ] ; then
git checkout v0.2.0
git checkout v0.4.0
fi
rm -rf build
mkdir -p build
Expand All @@ -218,7 +218,7 @@ popd

pushd rankstr
if [ $build_dev -eq 0 ] ; then
git checkout v0.2.0
git checkout v0.4.0
fi
rm -rf build
mkdir -p build
Expand All @@ -239,7 +239,7 @@ popd

pushd redset
if [ $build_dev -eq 0 ] ; then
git checkout v0.2.0
git checkout v0.4.0
fi
rm -rf build
mkdir -p build
Expand All @@ -260,7 +260,7 @@ popd

pushd shuffile
if [ $build_dev -eq 0 ] ; then
git checkout v0.2.0
git checkout v0.4.0
fi
rm -rf build
mkdir -p build
Expand All @@ -281,7 +281,7 @@ popd

pushd er
if [ $build_dev -eq 0 ] ; then
git checkout v0.2.0
git checkout v0.5.0
fi
rm -rf build
mkdir -p build
Expand Down
2 changes: 1 addition & 1 deletion dist/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.14.5)
PROJECT(SCR VERSION 3.0.1)
PROJECT(SCR VERSION 3.1.0)

# Find Packages & Files
LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
Expand Down
45 changes: 28 additions & 17 deletions dist/builddist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ print_usage() {
echo ""
echo "Tags:"
echo " develop - build tarball of latest"
# echo " v3.0rc1"
# echo " v3.0rc2"
echo " v3.0"
echo " v3.1.0"
}

# check that we got an argument or print usage
Expand Down Expand Up @@ -59,19 +57,33 @@ if [ "$1" == "develop" ] ; then
# "rankstr" "ecp-veloc" "v0.1.0"
# "scr" "llnl" "v3.0rc2"
# )
elif [ "$1" == "v3.0" ] ; then
# to build the scr-v3.0 release
#elif [ "$1" == "v3.0" ] ; then
# # to build the scr-v3.0 release
# ORGS=(
# "lwgrp" "llnl" "v1.0.5"
# "dtcmp" "llnl" "v1.1.4"
# "kvtree" "ecp-veloc" "v1.3.0"
# "axl" "ecp-veloc" "v0.6.0"
# "spath" "ecp-veloc" "v0.2.0"
# "shuffile" "ecp-veloc" "v0.2.0"
# "redset" "ecp-veloc" "v0.2.0"
# "er" "ecp-veloc" "v0.2.0"
# "rankstr" "ecp-veloc" "v0.2.0"
# "scr" "llnl" "v3.0"
# )
elif [ "$1" == "v3.1.0" ] ; then
# to build the scr-v3.1.0 release
ORGS=(
"lwgrp" "llnl" "v1.0.5"
"dtcmp" "llnl" "v1.1.4"
"kvtree" "ecp-veloc" "v1.3.0"
"axl" "ecp-veloc" "v0.6.0"
"spath" "ecp-veloc" "v0.2.0"
"shuffile" "ecp-veloc" "v0.2.0"
"redset" "ecp-veloc" "v0.2.0"
"er" "ecp-veloc" "v0.2.0"
"rankstr" "ecp-veloc" "v0.2.0"
"scr" "llnl" "v3.0"
"lwgrp" "llnl" "v1.0.6"
"dtcmp" "llnl" "v1.1.5"
"kvtree" "ecp-veloc" "v1.5.0"
"axl" "ecp-veloc" "v0.9.0"
"spath" "ecp-veloc" "v0.4.0"
"shuffile" "ecp-veloc" "v0.4.0"
"redset" "ecp-veloc" "v0.4.0"
"er" "ecp-veloc" "v0.5.0"
"rankstr" "ecp-veloc" "v0.4.0"
"scr" "llnl" "v3.1.0"
)
else
echo "Error: unknown tag: $1"
Expand Down Expand Up @@ -134,8 +146,7 @@ for (( i=0; i<${len}; i=$(($i + 3)) )); do
cd ..
done

# NOTE: last TAG is from SCR
# rename archive directory to scr-TAG
# rename archive directory to scr-SCRTAG
mv $ARCH_DIR scr-$TAG

# copy in top-level CMake files
Expand Down
4 changes: 2 additions & 2 deletions doc-dev/rst/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
version = '3.0'
version = '3.1'
# The full version, including alpha/beta/rc tags.
release = '3.0.1'
release = '3.1.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
30 changes: 15 additions & 15 deletions doc/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@
#
alabaster==0.7.16
# via sphinx
babel==2.14.0
babel==2.15.0
# via sphinx
certifi==2023.11.17
certrfi==2024.7.4
# via requests
charset-normalizer==3.3.2
# via requests
docutils==0.20.1
# via
# sphinx
# sphinx-rtd-theme
idna==3.6
idna==3.7
# via requests
imagesize==1.4.1
# via sphinx
jinja2==3.1.3
jinja2==3.1.4
# via sphinx
markupsafe==2.1.3
markupsafe==2.1.5
# via jinja2
packaging==23.2
packaging==24.1
# via sphinx
pygments==2.17.2
pygments==2.18.0
# via sphinx
requests==2.31.0
requests==2.32.3
# via sphinx
snowballstemmer==2.2.0
# via sphinx
sphinx==7.2.6
sphinx==7.4.7
# via
# -r doc/requirements.in
# sphinx-rtd-theme
Expand All @@ -44,21 +44,21 @@ sphinx==7.2.6
# sphinxcontrib-serializinghtml
sphinx-rtd-theme==2.0.0
# via -r doc/requirements.in
sphinxcontrib-applehelp==1.0.8
sphinxcontrib-applehelp==2.0.0
# via sphinx
sphinxcontrib-devhelp==1.0.6
sphinxcontrib-devhelp==2.0.0
# via sphinx
sphinxcontrib-htmlhelp==2.0.5
sphinxcontrib-htmlhelp==2.1.0
# via sphinx
sphinxcontrib-jquery==4.1
# via sphinx-rtd-theme
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.7
sphinxcontrib-qthelp==2.0.0
# via sphinx
sphinxcontrib-serializinghtml==1.1.10
sphinxcontrib-serializinghtml==2.0.0
# via sphinx
urllib3==2.1.0
urllib3==2.2.2
# via requests

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions doc/rst/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
version = '3.0'
version = '3.1'
# The full version, including alpha/beta/rc tags.
release = '3.0.1'
release = '3.1.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
6 changes: 3 additions & 3 deletions doc/rst/users/build.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ To build SCR from a release tarball:

.. code-block:: bash

wget https://github.com/LLNL/scr/releases/download/v3.0/scr-v3.0.tgz
tar -zxf scr-v3.0.tgz
cd scr-v3.0
wget https://github.com/LLNL/scr/releases/download/v3.1.0/scr-v3.1.0.tgz
tar -zxf scr-v3.1.0.tgz
cd scr-v3.1.0

mkdir build
cd build
Expand Down
10 changes: 5 additions & 5 deletions doc/rst/users/quick.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ please see Section :ref:`sec-library`.
CMake
^^^^^

SCR requires CMake version 2.8 or higher.
SCR requires CMake version 3.14.5 or higher.
The SCR build uses the CMake FindMPI module to link with MPI.
This module looks for the standard :code:`mpicc` compiler wrapper,
which must be in your :code:`PATH`.
Expand All @@ -32,9 +32,9 @@ To download and build SCR with CMake:

.. code-block:: bash

wget https://github.com/LLNL/scr/releases/download/v3.0/scr-v3.0.tgz
tar -zxf scr-v3.0.tgz
cd scr-v3.0
wget https://github.com/LLNL/scr/releases/download/v3.1.0/scr-v3.1.0.tgz
tar -zxf scr-v3.1.0.tgz
cd scr-v3.1.0

mkdir build install
cd build
Expand All @@ -61,7 +61,7 @@ SCR can then be installed for SLURM systems with:

.. code-block:: bash

spack install scr@3.0
spack install scr@3.1.0

This downloads, builds, and installs SCR and its dependencies.

Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setup(
name='scr',
version='3.0',
version='3.1.0',
author='LLNL',
author_email='moody20@llnl.gov',
url='https://github.com/llnl/scr',
Expand Down
4 changes: 2 additions & 2 deletions src/scr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ extern "C" {

/* Version information */
#define SCR_MAJOR_VERSION "3"
#define SCR_MINOR_VERSION "0"
#define SCR_MINOR_VERSION "1"
#define SCR_PATCH_VERSION "0"
#define SCR_VERSION "v3.0.0"
#define SCR_VERSION "v3.1.0"

/* constants returned from SCR functions for success and failure */
#define SCR_SUCCESS (0)
Expand Down
2 changes: 1 addition & 1 deletion testing/MAKE_AND_RUN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [ -z "$SCR_INSTALL" ]; then export SCR_INSTALL="${SCR_BUILD}/install"; fi
#if [ -z "$SCR_INSTALL" ]; then export SCR_INSTALL="/usr/projects/SCR/TR-installs/scr_dw_with_source/install"; fi
if [ -z "$SCR_LAUNCH_DIR" ]; then export SCR_LAUNCH_DIR="/lustre/ttscratch1/becker33"; fi

export scrversion="scr-1.1.8"
export scrversion="scr-3.1.0"

cd ${SCR_BUILD}/${scrversion}
make clean
Expand Down
0