Skip to content

Commit

Permalink
Merge pull request #381 from glotzerlab/update-packages-trunk
Browse files Browse the repository at this point in the history
Update packages on trunk
  • Loading branch information
joaander authored Apr 1, 2024
2 parents 5b191b8 + 5408cec commit 8f3d2ec
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions make_dockerfiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ def write(fname, templates, **kwargs):
test_template = env.get_template('test.jinja')

write('docker/nompi/Dockerfile', [base_template, glotzerlab_software_template, test_template, finalize_template],
FROM='nvidia/cuda:11.1.1-devel-ubuntu20.04',
FROM='nvidia/cuda:11.8.0-devel-ubuntu20.04',
ENABLE_MPI='off',
MAKEJOBS=multiprocessing.cpu_count()+2,
CUDA_VERSION='11.1',
CUDA_VERSION='11.8',
**versions)

# see https://stackoverflow.com/questions/5470257/how-to-see-which-flags-march-native-will-activate
Expand Down
2 changes: 1 addition & 1 deletion packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pybind11:
ignore: alpha,rc,beta
include_v_prefix: false
repository: https://github.com/pybind/pybind11
version: 2.11.1
version: 2.12.0
qhull:
ignore: alpha,rc,beta
include_v_prefix: false
Expand Down
4 changes: 2 additions & 2 deletions requirements-source.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Cython==3.0.9
Cython==3.0.10
numpy==1.26.4
pkgconfig==1.5.5
pybind11==2.11.1
pybind11==2.12.0
pythran==0.15.0
scikit-build==0.17.6
scipy==1.12.0
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ rowan==1.3.0.post1
coxeter==0.8.0
plato-draw==1.12.0
signac==2.2.0
signac-flow==0.28.0
signac-flow==0.29.0
signac-dashboard==0.6.1

# transitive dependencies
Expand All @@ -24,7 +24,7 @@ matplotlib==3.8.3
notebook==7.1.2
opencv-python==4.9.0.80
pandas==2.2.1
Pillow==10.2.0
Pillow==10.3.0
pyqt5==5.15.10
pyyaml==6.0.1
scikit-learn==1.4.1.post1
Expand All @@ -33,13 +33,13 @@ statsmodels==0.14.1


# test requirements
hypothesis==6.99.9
hypothesis==6.100.0
pytest==8.1.1
miniball==1.2.0
sympy==1.12
tables==3.9.2
coverage==7.4.4
click==8.1.7
pytest-cov==4.1.0
pytest-cov==5.0.0
ruamel.yaml==0.18.6
gitpython==3.1.42
gitpython==3.1.43
4 changes: 2 additions & 2 deletions script/crusher/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ fi
# install pybind11 headers
if [ ! -f $ROOT/include/pybind11/pybind11.h ]
then
curl -SL https://github.com/pybind/pybind11/archive/v2.11.1.tar.gz | tar -xzC $BUILDDIR && \
cd pybind11-2.11.1 && \
curl -SL https://github.com/pybind/pybind11/archive/v2.12.0.tar.gz | tar -xzC $BUILDDIR && \
cd pybind11-2.12.0 && \
mkdir build && cd build && \
cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOT -DPYBIND11_TEST=off && \
make install && \
Expand Down
4 changes: 2 additions & 2 deletions script/frontier/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ fi
# install pybind11 headers
if [ ! -f $ROOT/include/pybind11/pybind11.h ]
then
curl -SL https://github.com/pybind/pybind11/archive/v2.11.1.tar.gz | tar -xzC $BUILDDIR && \
cd pybind11-2.11.1 && \
curl -SL https://github.com/pybind/pybind11/archive/v2.12.0.tar.gz | tar -xzC $BUILDDIR && \
cd pybind11-2.12.0 && \
mkdir build && cd build && \
cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOT -DPYBIND11_TEST=off && \
make install && \
Expand Down

0 comments on commit 8f3d2ec

Please sign in to comment.