Merge pull request #326 from glotzerlab/update-packages-trunk

Update packages on trunk
glotzerlab · Sep 28, 2023 · 592698a · 592698a
2 parents f173d06 + b000869
commit 592698a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/packages.yml b/packages.yml
@@ -12,7 +12,7 @@ embree:
   ignore: alpha,rc,beta,ploc
   include_v_prefix: false
   repository: https://github.com/embree/embree
-  version: 4.2.0
+  version: 4.3.0
 fresnel:
   ignore: alpha,rc,beta
   repository: https://github.com/glotzerlab/fresnel

diff --git a/requirements-source.txt b/requirements-source.txt
@@ -4,4 +4,4 @@ pkgconfig==1.5.5
 pybind11==2.11.1
 pythran==0.14.0
 scikit-build==0.17.6
-scipy==1.11.2
+scipy==1.11.3
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 # glotzer tools
 freud-analysis==2.13.1
-gsd==3.1.1
+gsd==3.2.0
 garnett==0.7.1
 pythia-learn==0.3.0
 rowan==1.3.0.post1
@@ -16,7 +16,7 @@ jupyter==1.0.0; platform_machine != 'ppc64le'
 jupyterlab==4.0.6; platform_machine != 'ppc64le'
 matplotlib==3.8.0; platform_machine != 'ppc64le'
 notebook==7.0.4; platform_machine != 'ppc64le'
-opencv-python==4.8.0.76; platform_machine != 'ppc64le'
+opencv-python==4.8.1.78; platform_machine != 'ppc64le'
 pandas==2.1.1
 Pillow==10.0.1
 pyqt5==5.15.9; platform_machine != 'ppc64le'
@@ -35,4 +35,4 @@ tables==3.8.0; platform_machine != 'ppc64le'
 coverage==7.3.1
 click==8.1.7
 pytest-cov==4.1.0
-ruamel.yaml==0.17.32
+ruamel.yaml==0.17.33
diff --git a/script/crusher/install.sh b/script/crusher/install.sh
@@ -89,8 +89,8 @@ fi
 # Embree
 if [ ! -f $ROOT/lib64/libembree4.so ]
 then
-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 \
+curl -sSL https://github.com/embree/embree/archive/v4.3.0/embree-4.3.0.tar.gz | tar -xzC $BUILDDIR \
+    && cd $BUILDDIR/embree-4.3.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 \
@@ -163,7 +163,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.2.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.3.0.x86_64.linux -DCMAKE_INSTALL_PREFIX=`python3 -c "import site; print(site.getsitepackages()[0])"` \
     && make install -j32 \
     && cd ../../ \
     && rm -rf fresnel \

diff --git a/script/frontier/install.sh b/script/frontier/install.sh
@@ -92,8 +92,8 @@ fi
 # Embree
 if [ ! -f $ROOT/lib64/libembree4.so ]
 then
-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 \
+curl -sSL https://github.com/embree/embree/archive/v4.3.0/embree-4.3.0.tar.gz | tar -xzC $BUILDDIR \
+    && cd $BUILDDIR/embree-4.3.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 \
@@ -166,7 +166,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.2.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.3.0.x86_64.linux -DCMAKE_INSTALL_PREFIX=`python3 -c "import site; print(site.getsitepackages()[0])"` \
     && make install -j32 \
     && cd ../../ \
     && rm -rf fresnel \