Skip to content

Update boost repository location and bump default version #505

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
Feb 26, 2025
Merged

Update boost repository location and bump default version #505

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 docs/building_blocks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ repository. For versions of Boost older than 1.63.0, the
SourceForge repository should be used. The default is False.

- __version__: The version of Boost source to download. The default
value is `1.76.0`.
value is `1.87.0`.

__Examples__

Expand Down
6 changes: 3 additions & 3 deletions hpccm/building_blocks/boost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class boost(bb_base, hpccm.templates.envvars, hpccm.templates.ldconfig,
SourceForge repository should be used. The default is False.

version: The version of Boost source to download. The default
value is `1.76.0`.
value is `1.87.0`.

# Examples

Expand All @@ -103,14 +103,14 @@ def __init__(self, **kwargs):

self.__b2_opts = kwargs.get('b2_opts', [])
self.__baseurl = kwargs.get('baseurl',
'https://boostorg.jfrog.io/artifactory/main/release/__version__/source')
'https://archives.boost.io/release/__version__/source')
self.__bootstrap_opts = kwargs.get('bootstrap_opts', [])
self.__ospackages = kwargs.get('ospackages', [])
self.__parallel = kwargs.get('parallel', '$(nproc)')
self.__prefix = kwargs.get('prefix', '/usr/local/boost')
self.__python = kwargs.get('python', False)
self.__sourceforge = kwargs.get('sourceforge', False)
self.__version = kwargs.get('version', '1.76.0')
self.__version = kwargs.get('version', '1.87.0')

self.__commands = [] # Filled in by __setup()
self.__wd = kwargs.get('wd', hpccm.config.g_wd) # working directory
Expand Down
28 changes: 14 additions & 14 deletions test/test_boost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_defaults_ubuntu(self):
"""Default boost building block"""
b = boost()
self.assertEqual(str(b),
r'''# Boost version 1.76.0
r'''# Boost version 1.87.0
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
bzip2 \
Expand All @@ -46,11 +46,11 @@ def test_defaults_ubuntu(self):
wget \
zlib1g-dev && \
rm -rf /var/lib/apt/lists/*
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2 && \
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_76_0.tar.bz2 -C /var/tmp -j && \
cd /var/tmp/boost_1_76_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.bz2 && \
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_87_0.tar.bz2 -C /var/tmp -j && \
cd /var/tmp/boost_1_87_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \
./b2 -j$(nproc) -q install && \
rm -rf /var/tmp/boost_1_76_0.tar.bz2 /var/tmp/boost_1_76_0
rm -rf /var/tmp/boost_1_87_0.tar.bz2 /var/tmp/boost_1_87_0
ENV LD_LIBRARY_PATH=/usr/local/boost/lib:$LD_LIBRARY_PATH''')

@centos
Expand All @@ -59,7 +59,7 @@ def test_defaults_centos(self):
"""Default boost building block"""
b = boost()
self.assertEqual(str(b),
r'''# Boost version 1.76.0
r'''# Boost version 1.87.0
RUN yum install -y \
bzip2 \
bzip2-devel \
Expand All @@ -68,11 +68,11 @@ def test_defaults_centos(self):
which \
zlib-devel && \
rm -rf /var/cache/yum/*
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2 && \
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_76_0.tar.bz2 -C /var/tmp -j && \
cd /var/tmp/boost_1_76_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.bz2 && \
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_87_0.tar.bz2 -C /var/tmp -j && \
cd /var/tmp/boost_1_87_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \
./b2 -j$(nproc) -q install && \
rm -rf /var/tmp/boost_1_76_0.tar.bz2 /var/tmp/boost_1_76_0
rm -rf /var/tmp/boost_1_87_0.tar.bz2 /var/tmp/boost_1_87_0
ENV LD_LIBRARY_PATH=/usr/local/boost/lib:$LD_LIBRARY_PATH''')

@ubuntu
Expand All @@ -90,7 +90,7 @@ def test_python(self):
wget \
zlib1g-dev && \
rm -rf /var/lib/apt/lists/*
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_72_0.tar.bz2 -C /var/tmp -j && \
cd /var/tmp/boost_1_72_0 && ./bootstrap.sh --prefix=/usr/local/boost && \
./b2 -j$(nproc) -q install && \
Expand Down Expand Up @@ -134,7 +134,7 @@ def test_ldconfig(self):
wget \
zlib1g-dev && \
rm -rf /var/lib/apt/lists/*
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.68.0/source/boost_1_68_0.tar.bz2 && \
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.68.0/source/boost_1_68_0.tar.bz2 && \
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_68_0.tar.bz2 -C /var/tmp -j && \
cd /var/tmp/boost_1_68_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \
./b2 -j$(nproc) -q install && \
Expand All @@ -156,7 +156,7 @@ def test_bootstrap_opts(self):
wget \
zlib1g-dev && \
rm -rf /var/lib/apt/lists/*
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_72_0.tar.bz2 -C /var/tmp -j && \
cd /var/tmp/boost_1_72_0 && ./bootstrap.sh --prefix=/usr/local/boost --with-libraries=atomic,chrono && \
./b2 -j$(nproc) -q install && \
Expand All @@ -177,7 +177,7 @@ def test_b2_opts(self):
wget \
zlib1g-dev && \
rm -rf /var/lib/apt/lists/*
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_72_0.tar.bz2 -C /var/tmp -j && \
cd /var/tmp/boost_1_72_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \
./b2 cxxflags="-std=c++14" -j$(nproc) -q install && \
Expand Down
Loading