Skip to content

Commit

Permalink
Merge pull request #314 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 Aug 7, 2023
2 parents e98e773 + e2c172d commit 691b382
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ embree:
ignore: alpha,rc,beta,ploc
include_v_prefix: false
repository: https://github.com/embree/embree
version: 4.1.0
version: 4.2.0
fresnel:
ignore: alpha,rc,beta
repository: https://github.com/glotzerlab/fresnel
version: v0.13.5
hoomd:
ignore: beta,alpha,rc
repository: https://github.com/glotzerlab/hoomd-blue
version: v4.0.1
version: v4.1.0
osu_microbenchmark:
repository: null
version: 5.4.1
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# glotzer tools
freud-analysis==2.13.0
gsd==3.1.0
gsd==3.1.1
garnett==0.7.1
pythia-learn==0.3.0
rowan==1.3.0.post1
Expand All @@ -13,9 +13,9 @@ signac-dashboard==0.5.0
# commonly used packages
h5py==3.9.0
jupyter==1.0.0; platform_machine != 'ppc64le'
jupyterlab==4.0.3; platform_machine != 'ppc64le'
jupyterlab==4.0.4; platform_machine != 'ppc64le'
matplotlib==3.7.2; platform_machine != 'ppc64le'
notebook==7.0.1; platform_machine != 'ppc64le'
notebook==7.0.2; platform_machine != 'ppc64le'
opencv-python==4.8.0.74; platform_machine != 'ppc64le'
pandas==2.0.3
Pillow==10.0.0
Expand All @@ -27,7 +27,7 @@ statsmodels==0.14.0; platform_machine != 'ppc64le'


# test requirements
hypothesis==6.82.0
hypothesis==6.82.2
pytest==7.4.0
miniball==1.2.0
sympy==1.12
Expand Down
8 changes: 4 additions & 4 deletions script/crusher/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ fi
# Embree
if [ ! -f $ROOT/lib64/libembree4.so ]
then
curl -sSL https://github.com/embree/embree/archive/v4.1.0/embree-4.1.0.tar.gz | tar -xzC $BUILDDIR \
&& cd $BUILDDIR/embree-4.1.0 \
curl -sSL https://github.com/embree/embree/archive/v4.2.0/embree-4.2.0.tar.gz | tar -xzC $BUILDDIR \
&& cd $BUILDDIR/embree-4.2.0 \
&& mkdir build && cd build \
&& cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOT -DCMAKE_INSTALL_LIBDIR=lib64/ -DCMAKE_BUILD_TYPE=Release -DEMBREE_TUTORIALS=OFF -DEMBREE_MAX_ISA="AVX2" -DEMBREE_ISPC_SUPPORT=OFF \
&& make install -j 32 \
Expand Down Expand Up @@ -160,7 +160,7 @@ then
&& mkdir -p build \
&& cd build \
&& export CFLAGS="-march=native" CXXFLAGS="-march=native" \
&& cmake ../ -DENABLE_EMBREE=on -DENABLE_OPTIX=off -Dembree_DIR=/opt/embree-4.1.0.x86_64.linux -DCMAKE_INSTALL_PREFIX=`python3 -c "import site; print(site.getsitepackages()[0])"` \
&& cmake ../ -DENABLE_EMBREE=on -DENABLE_OPTIX=off -Dembree_DIR=/opt/embree-4.2.0.x86_64.linux -DCMAKE_INSTALL_PREFIX=`python3 -c "import site; print(site.getsitepackages()[0])"` \
&& make install -j32 \
&& cd ../../ \
&& rm -rf fresnel \
Expand All @@ -177,7 +177,7 @@ fi
if [ ! -n "$(ls -d $ROOT/lib/python*/site-packages/hoomd)" ]
then

git clone --recursive --branch v4.0.1 --depth 1 https://github.com/glotzerlab/hoomd-blue hoomd \
git clone --recursive --branch v4.1.0 --depth 1 https://github.com/glotzerlab/hoomd-blue hoomd \
&& cd hoomd \
&& mkdir -p build \
&& cd build \
Expand Down
8 changes: 4 additions & 4 deletions script/frontier/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ fi
# Embree
if [ ! -f $ROOT/lib64/libembree4.so ]
then
curl -sSL https://github.com/embree/embree/archive/v4.1.0/embree-4.1.0.tar.gz | tar -xzC $BUILDDIR \
&& cd $BUILDDIR/embree-4.1.0 \
curl -sSL https://github.com/embree/embree/archive/v4.2.0/embree-4.2.0.tar.gz | tar -xzC $BUILDDIR \
&& cd $BUILDDIR/embree-4.2.0 \
&& mkdir build && cd build \
&& cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOT -DCMAKE_INSTALL_LIBDIR=lib64/ -DCMAKE_BUILD_TYPE=Release -DEMBREE_TUTORIALS=OFF -DEMBREE_MAX_ISA="AVX2" -DEMBREE_ISPC_SUPPORT=OFF \
&& make install -j 32 \
Expand Down Expand Up @@ -161,7 +161,7 @@ then
&& mkdir -p build \
&& cd build \
&& export CFLAGS="-march=native" CXXFLAGS="-march=native" \
&& cmake ../ -DENABLE_EMBREE=on -DENABLE_OPTIX=off -Dembree_DIR=/opt/embree-4.1.0.x86_64.linux -DCMAKE_INSTALL_PREFIX=`python3 -c "import site; print(site.getsitepackages()[0])"` \
&& cmake ../ -DENABLE_EMBREE=on -DENABLE_OPTIX=off -Dembree_DIR=/opt/embree-4.2.0.x86_64.linux -DCMAKE_INSTALL_PREFIX=`python3 -c "import site; print(site.getsitepackages()[0])"` \
&& make install -j32 \
&& cd ../../ \
&& rm -rf fresnel \
Expand All @@ -178,7 +178,7 @@ fi
if [ ! -n "$(ls -d $ROOT/lib/python*/site-packages/hoomd)" ]
then

git clone --recursive --branch v4.0.1 --depth 1 https://github.com/glotzerlab/hoomd-blue hoomd \
git clone --recursive --branch v4.1.0 --depth 1 https://github.com/glotzerlab/hoomd-blue hoomd \
&& cd hoomd \
&& mkdir -p build \
&& cd build \
Expand Down
2 changes: 1 addition & 1 deletion script/summit/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ fi
if [ ! -n "$(ls -d $ROOT/lib/python*/site-packages/hoomd)" ]
then

git clone --recursive --branch v4.0.1 --depth 1 https://github.com/glotzerlab/hoomd-blue hoomd \
git clone --recursive --branch v4.1.0 --depth 1 https://github.com/glotzerlab/hoomd-blue hoomd \
&& cd hoomd \
&& mkdir -p build \
&& cd build \
Expand Down

0 comments on commit 691b382

Please sign in to comment.