cms-sw · smuzaffar · Jan 23, 2023 · Jan 23, 2023 · Jan 23, 2023 · Jan 24, 2023
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
@@ -1,4 +1,4 @@
-### RPM external abseil-cpp 20210324.2
+### RPM external abseil-cpp 20220623.1
 Source: https://github.com/abseil/abseil-cpp/archive/%{realversion}.tar.gz
 
 BuildRequires: cmake gmake

diff --git a/bazel-3.7.0-patches.patch b/bazel-3.7.0-patches.patch
@@ -1,23 +1,23 @@
 diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkActionFactoryApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkActionFactoryApi.java
-index 0ea30a9..8df189f 100755
+index 9f7fe1f..e584fb9 100755
 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkActionFactoryApi.java
 +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkActionFactoryApi.java
-@@ -359,7 +359,7 @@ public interface StarlarkActionFactoryApi extends StarlarkValue {
+@@ -377,7 +377,7 @@ public interface StarlarkActionFactoryApi extends StarlarkValue {
+                     + " the former are more efficient."),
          @Param(
              name = "use_default_shell_env",
-             type = Boolean.class,
 -            defaultValue = "False",
 +            defaultValue = "True",
              named = true,
              positional = false,
              doc = "Whether the action should use the built in shell environment or not."),
 diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl
-index d48485b..40ca051 100755
+index bfb37bd..45e311c 100755
 --- a/tools/cpp/unix_cc_configure.bzl
 +++ b/tools/cpp/unix_cc_configure.bzl
-@@ -193,6 +193,7 @@ def _find_gold_linker_path(repository_ctx, cc):
+@@ -184,6 +184,7 @@ def _find_linker_path(repository_ctx, cc, linker, is_clang):
      Returns:
-       String to put as value to -fuse-ld= flag, or None if gold couldn't be found.
+       String to put as value to -fuse-ld= flag, or None if linker couldn't be found.
      """
 +    return None
      result = repository_ctx.execute([

diff --git a/bazel-3.7.2-gcc11.patch b/bazel-3.7.2-gcc11.patch
diff --git a/bazel.spec b/bazel.spec
@@ -1,4 +1,4 @@
-### RPM external bazel 3.7.2
+### RPM external bazel 6.0.0
 
 Source: https://github.com/bazelbuild/bazel/releases/download/%{realversion}/bazel-%{realversion}-dist.zip
 
@@ -17,7 +17,6 @@ BuildRequires: java-env python3 python-python3
 # configuration issue
 # https://github.com/bazelbuild/bazel/issues/9392
 Patch0: bazel-3.7.0-patches
-Patch1: bazel-3.7.2-gcc11
 
 %prep
 
@@ -26,7 +25,6 @@ Patch1: bazel-3.7.2-gcc11
 %setup -q -n bazel-%{realversion}
 
 %patch0 -p1
-%patch1 -p1
 
 %build
 

diff --git a/eigen.spec b/eigen.spec
@@ -1,7 +1,7 @@
-### RPM external eigen 82dd3710dac619448f50331c1d6a35da673f764a
+### RPM external eigen 3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e
 ## INITENV +PATH PKG_CONFIG_PATH %{i}/share/pkgconfig
 ## NOCOMPILER
-%define tag 43d8892d117e4e76b6c472b942ebefee00bfc172
+%define tag fe7e6a8ef4921dd6c7b5b893a9972948f1b451d3
 %define branch cms/master/%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%{github_user}/eigen-git-mirror.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz

diff --git a/flatbuffers.spec b/flatbuffers.spec
@@ -1,4 +1,4 @@
-### RPM external flatbuffers 1.12.0
+### RPM external flatbuffers 2.0.8
 ## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64
 
 %define tag v%{realversion}
@@ -29,3 +29,6 @@ make -v %{makeprocesses}
 cd ../build
 
 make %{makeprocesses} install
+
+%post
+%{relocateConfig}lib64/pkgconfig/flatbuffers.pc
diff --git a/gbl.spec b/gbl.spec
@@ -1,4 +1,4 @@
-### RPM external gbl V02-04-01
+### RPM external gbl V03-00-00
 
 %define tag 31e726d777fe93cdbed0c363dc15f803f7767f40
 Source: git+https://gitlab.desy.de/claus.kleinwort/general-broken-lines.git?obj=main/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
@@ -18,6 +18,7 @@ cd build
 cmake ../cpp \
   -DCMAKE_INSTALL_PREFIX=%{i} \
   -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_STANDARD=17 \
   -DEIGEN3_INCLUDE_DIR=${EIGEN_ROOT}/include/eigen3 \
   -DSUPPORT_ROOT=False
 

diff --git a/giflib.spec b/giflib.spec
@@ -1,4 +1,4 @@
-### RPM external giflib 5.2.0
+### RPM external giflib 5.2.1
 
 Source: https://sourceforge.net/projects/giflib/files/giflib-%{realversion}.tar.gz
 BuildRequires: autotools

diff --git a/java-env.spec b/java-env.spec
@@ -1,10 +1,10 @@
-### RPM external java-env 1.1
+### RPM external java-env 11.0
 ## INITENV SET JAVA_HOME %{java_home}
 ## INITENV +PATH PATH %{java_home}/bin
 ## INITENV +PATH LD_LIBRARY_PATH %{java_home}/lib
 ## NOCOMPILER
 
-%define java_home /usr/lib/jvm/java
+%define java_home /etc/alternatives/jre_11
 Source: none
 
 %prep

diff --git a/lwtnn.spec b/lwtnn.spec
@@ -17,6 +17,7 @@ cmake ../%{n}-%{realversion} \
   -G Ninja \
   -DCMAKE_CXX_COMPILER="g++" \
   -DCMAKE_CXX_FLAGS="-fPIC" \
+  -DCMAKE_CXX_STANDARD=17 \
   -DCMAKE_INSTALL_PREFIX:PATH="%{i}" \
   -DCMAKE_BUILD_TYPE=Release \
   -DBUILTIN_BOOST=OFF \

diff --git a/mxnet-predict.spec b/mxnet-predict.spec
@@ -1,9 +1,9 @@
-### RPM external mxnet-predict 1.6.0
+### RPM external mxnet-predict 1.9.1
 ## INITENV +PATH PYTHON3PATH %{i}/$PYTHON3_LIB_SITE_PACKAGES
 ## INITENV +PATH LD_LIBRARY_PATH %{i}/lib
 
-%define tag b4aada51b4af56a05adc4ed17f77001bfd6943d8
-%define branch 1.6.0
+%define tag b4176711680bd6f8f885c1b0e51ad203c5559cdf
+%define branch cms/v%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%{github_user}/incubator-mxnet.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}-%{tag}.tgz
 

diff --git a/opencv.spec b/opencv.spec
@@ -1,4 +1,4 @@
-### RPM external opencv 4.5.5
+### RPM external opencv 4.7.0
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
 %define tag %{realversion}
 %define branch master
@@ -19,6 +19,7 @@ cd ../build
 cmake ../%{n}-%{realversion} \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX="%{i}" \
+    -DCMAKE_CXX_STANDARD=17 \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DWITH_EIGEN=ON \
     -DBUILD_EXAMPLES=OFF \

diff --git a/pip/contourpy.file b/pip/contourpy.file
@@ -0,0 +1 @@
+Requires: py3-pybind11 py3-numpy
diff --git a/pip/cython.file b/pip/cython.file
@@ -1 +1,2 @@
+%define source0 https://github.com/cython/cython/archive/%{realversion}.tar.gz
 %define pip_name Cython
diff --git a/pip/matplotlib.file b/pip/matplotlib.file
@@ -4,5 +4,5 @@ Requires: py3-numpy py3-pillow
   export LDFLAGS="-L${FREETYPE_ROOT}/lib -L${LIBPNG_ROOT}/lib" \
   export PKG_CONFIG=false
 Requires: py3-cycler py3-kiwisolver py3-pyparsing py3-python-dateutil py3-certifi
-Requires: py3-fonttools py3-packaging
+Requires: py3-fonttools py3-packaging py3-contourpy
 Requires: zlib libpng freetype
diff --git a/pip/requirements.txt b/pip/requirements.txt
@@ -38,18 +38,19 @@ backports-entry-points-selectable==1.1.1
 beautifulsoup4==4.11.1
 beniget==0.4.1
 bleach==5.0.1
+blosc2==2.0.0
 bokeh==2.4.3
-boost-histogram==1.3.1
+boost-histogram==1.3.2
 bottle==0.12.23
-Bottleneck==1.3.5
+Bottleneck==1.3.6
 cachecontrol==0.12.11
 cachetools==5.2.0
 cachy==0.3.0
 charset-normalizer==2.1.1
 cleo==0.8.1
 clikit==0.6.2
 cmsml==0.1.2
-correctionlib==2.1.0
+correctionlib==2.2.2
 crashtest==0.4.0
 certifi==2022.9.14
 cffi==1.15.1
@@ -61,14 +62,15 @@ commonmark==0.9.1
 conan==1.52.0
 contextlib2==21.6.0
 contextvars==2.4
+contourpy==1.0.7
 coverage==6.4.4
 cppy==1.2.1
 # Newer versions of py3-cryptography require OpenSSL 1.1.0+, see https://github.com/pyca/cryptography/issues/5906
 cryptography==37.0.4
 cryptography==3.2.1 ; cmsos_name=='slc7'
 cx-Oracle==8.3.0
 cycler==0.11.0
-cython==0.29.32
+cython==3.0.0a11
 decorator==5.1.1
 debugpy==1.6.3
 defusedxml==0.7.1
@@ -107,13 +109,13 @@ grpcio==1.48.1
 grpcio-tools==1.48.1
 hatchling==1.8.1
 h5py==3.7.0
-hepdata-lib==0.10.1
+hepdata-lib==0.11.0
 hepdata-validator==0.3.3
 hep_ml==0.7.1
 hist==2.6.1
 histbook==1.2.5
 histoprint==2.4.0
-histogrammar==1.0.31
+histogrammar==1.0.33
 html5lib==1.1
 idna==3.3
 immutables==0.18
@@ -142,13 +144,13 @@ jupyterlab-pygments==0.2.2
 jupyter-server==1.18.1
 jupyter-server-mathjax==0.2.6
 jupyterlab-widgets==3.0.3
-keras==2.6.0
+keras==2.11.0
 keras-applications==1.0.8
 keras-preprocessing==1.1.2
 keras2onnx==1.7.0
 keyring==23.9.1
 kiwisolver==1.4.4
-law==0.1.7
+law==0.1.12
 lazy-object-proxy==1.7.1
 lizard==1.17.10
 llvmlite==0.38.1
@@ -160,9 +162,10 @@ make==0.1.6.post2
 Mako==1.2.2
 Markdown==3.4.1
 MarkupSafe==2.1.1
-matplotlib==3.5.3
+matplotlib==3.6.3
 matplotlib-inline==0.1.6
 mccabe==0.7.0
+MesonPy==0.0.1
 mistune==2.0.4
 mock==4.0.3
 more-itertools==8.14.0
@@ -181,8 +184,8 @@ networkx==2.8.6
 neurolab==0.3.5
 node-semver==0.8.1
 notebook==6.4.12
-numba==0.56.2
-numexpr==2.8.3
+numba==0.56.4
+numexpr==2.8.4
 numpy==1.22.4
 onnx==1.12.0
 onnxmltools==1.11.1
@@ -191,7 +194,7 @@ oauthlib==3.2.1
 opt-einsum==3.3.0
 pkginfo==1.8.3
 packaging==21.3
-pandas==1.4.4
+pandas==1.5.3
 pandocfilters==1.5.0
 parsimonious==0.10.0
 parso==0.8.3
@@ -222,11 +225,11 @@ ptyprocess==0.7.0
 pure-eval==0.2.2
 pyasn1-modules==0.2.8
 pyasn1==0.4.8
-pybind11==2.10.0
+pybind11==2.10.3
 pybrain==0.3.3
 pycodestyle==2.9.1
 pycparser==2.21
-pycuda==2022.1
+pycuda==2022.2.2
 pycurl==7.45.1
 pydot==1.4.2
 pyflakes==2.5.0
@@ -237,6 +240,7 @@ pymongo==4.2.0
 pyparsing==3.0.9
 pyrsistent==0.18.1
 py==1.11.0
+py-cpuinfo==9.0.0
 pydantic==1.10.2
 pygithub==1.55
 pylev==1.4.0
@@ -250,9 +254,9 @@ python-daemon==2.3.1
 python-dateutil==2.8.2
 python-ldap==3.4.2
 python-rapidjson==1.8
-pythran==0.11.0
+pythran==0.12.1
 pytoml==0.1.21
-pytools==2022.1.12
+pytools==2022.1.14
 pytz==2022.2.1
 PyYAML==6.0
 pyzmq==24.0.1
@@ -269,7 +273,7 @@ rsa==4.9
 scandir==1.10.0
 schema==0.7.5
 scikit-build==0.15.0
-scikit-learn==1.1.2
+scikit-learn==1.2.0
 scinum==1.4.3
 scipy==1.7.1
 secretstorage==3.3.3
@@ -296,9 +300,10 @@ sympy==1.11.1
 tables==3.7.0
 tenacity==8.0.1
 #NO_AUTO_UPDATE:1: Force to use tensorflow 2.6.4; this should match the version in tensorflow-sources.spec
-tensorflow==2.6.4
-tensorboard==2.10.0
-tensorflow-estimator==2.10.0
+tensorflow==2.11.0
+tensorflow-io-gcs-filesystem==0.30.0
+tensorboard==2.11.2
+tensorflow-estimator==2.11.0
 tensorboard-data-server==0.6.1
 tensorboard-plugin-wit==1.8.1
 termcolor==1.1.0
@@ -332,6 +337,6 @@ Werkzeug==2.2.2
 wheel==0.37.1
 widgetsnbextension==4.0.3
 wrapt==1.14.1
-xgboost==1.6.2
+xgboost==1.7.3
 yarl==1.8.1
 zipp==3.8.1
diff --git a/pip/tensorflow-io-gcs-filesystem.file b/pip/tensorflow-io-gcs-filesystem.file
@@ -0,0 +1,2 @@
+%define source0 https://github.com/tensorflow/io/archive/refs/tags/v0.30.0.tar.gz
+%define PipPreBuild export PIP_GLOBAL_OPTION="--project tensorflow-io-gcs-filesystem"
diff --git a/pip/tensorflow.file b/pip/tensorflow.file
@@ -2,9 +2,11 @@ Requires: py3-tensorboard py3-opt-einsum py3-tensorflow-estimator py3-wrapt py3-
 Requires: tensorflow-sources
 %define PipPreBuildPy PIPFILE=${TENSORFLOW_SOURCES_ROOT}/tensorflow-%{realversion}-cp%{cms_python3_major_minor}-cp%{cms_python3_major_minor}-linux_%{_arch}.whl
 %define PipPostBuild rm -f %{i}/bin/tensorboard* ; ls %{i}/bin/* | xargs -i mv '{}' '{}3'
+%define PipDepsPost | grep -v libclang
 ## INCLUDE tensorflow-requires
 Requires: py3-funcsigs py3-pbr py3-packaging py3-appdirs py3-pyparsing py3-mock py3-Werkzeug
 Requires: py3-grpcio py3-astunparse py3-keras
+Requires: py3-tensorflow-io-gcs-filesystem
 Requires: llvm
 %define source0 none
 %define source_file none
diff --git a/professor2.spec b/professor2.spec
@@ -13,8 +13,11 @@ Patch0: professor2-ppc64-flag-change
 %ifarch ppc64le
 %patch0 -p1
 %endif
+sed -i -e 's|^ *CXXSTD  *:=.*|CXXSTD:=c++17|' Makefile
+sed -i -e 's|std=c++11|std=c++17|' pyext/setup.py
 
-%define build_flags CPPFLAGS=-I${EIGEN_ROOT}/include/eigen3 PYTHON=$(which python3) PROF_VERSION=%{realversion} PYTHONPATH=./${PYTHON3_LIB_SITE_PACKAGES}
+
+%define build_flags CPPFLAGS=-I${EIGEN_ROOT}/include/eigen3 PYTHON=$(which python3) PROF_VERSION=%{realversion} PYTHONPATH=./${PYTHON3_LIB_SITE_PACKAGES}:./pyext/professor2
 
 %build
 make %{build_flags}

diff --git a/scram-tools.file/tools/abseil-cpp/abseil-cpp.xml b/scram-tools.file/tools/abseil-cpp/abseil-cpp.xml
@@ -28,7 +28,6 @@
   <lib name="absl_hash"/>
   <lib name="absl_hashtablez_sampler"/>
   <lib name="absl_int128"/>
-  <lib name="absl_leak_check_disable"/>
   <lib name="absl_leak_check"/>
   <lib name="absl_log_severity"/>
   <lib name="absl_malloc_internal"/>
@@ -60,7 +59,6 @@
   <lib name="absl_throw_delegate"/>
   <lib name="absl_time"/>
   <lib name="absl_time_zone"/>
-  <lib name="absl_wyhash"/>
   <client>
     <environment name="ABSEIL_CPP_BASE" default="@TOOL_ROOT@"/>
     <environment name="LIBDIR" default="$ABSEIL_CPP_BASE/lib"/>
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		%define source0 https://github.com/cython/cython/archive/%{realversion}.tar.gz
		%define pip_name Cython
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		%define source0 https://github.com/tensorflow/io/archive/refs/tags/v0.30.0.tar.gz
		%define PipPreBuild export PIP_GLOBAL_OPTION="--project tensorflow-io-gcs-filesystem"