Update submodules (dreamworksanimation#48)

* Update submodules * Update CentOs7 build * update to newer packages, add freetype * Suppress TBB DEPRECATED MESSAGES * Update Rocky9 container build * Add INSTALL_DIR for Rocky9 container USD --------- Co-authored-by: Rob Wilson <[email protected]>
SamuelClex · Oct 19, 2023 · 33abc41 · 33abc41
1 parent b2ac37d
commit 33abc41
Show file tree

Hide file tree

Showing 18 changed files with 87 additions and 54 deletions.
diff --git a/arras/arras4_core b/arras/arras4_core
diff --git a/arras/distributed/arras4_node b/arras/distributed/arras4_node
diff --git a/building/Centos7/CMakeLists.txt b/building/Centos7/CMakeLists.txt
@@ -11,6 +11,12 @@ project(openmoonray_third_party)
 
 include(ExternalProject)
 
+include(ProcessorCount)
+ProcessorCount(N)
+if(NOT N EQUAL 0)
+  set(JOBS_ARG -j${N})
+endif()
+
 # User configurable settings
 set(InstallRoot /usr/local CACHE FILEPATH "Install root for dependencies")
 set(PythonVer 3.6 CACHE STRING "Python version (n.m), e.g. 3.6")
@@ -31,7 +37,7 @@ ExternalProject_Add(Boost
     URL https://sourceforge.net/projects/boost/files/boost/1.73.0/boost_1_73_0.tar.gz
     UPDATE_COMMAND ./bootstrap.sh --prefix=${InstallRoot}
     CONFIGURE_COMMAND ""
-    BUILD_COMMAND ./b2 install -j$(nproc) --user-config=${THIS_DIR}/python-config.jam --with_python variant=release toolset=gcc link=shared threading=multi                  
+    BUILD_COMMAND ./b2 install ${JOBS_ARG} --user-config=${THIS_DIR}/python-config.jam --with_python variant=release toolset=gcc link=shared threading=multi
     BUILD_IN_SOURCE 1
     INSTALL_COMMAND ""
     DEPENDS ${CHAIN}
@@ -40,7 +46,7 @@ set(CHAIN Boost)
 
 ExternalProject_Add(JsonCpp
     GIT_REPOSITORY https://github.com/open-source-parsers/jsoncpp.git
-    GIT_TAG 15949af09856076b584c7b432f065386ccd267a9 # 0.7.0
+    GIT_TAG 5defb4ed1a4293b8e2bf641e16b156fb9de498cc # 1.9.5
     INSTALL_DIR ${InstallRoot}
     CMAKE_ARGS
         -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
@@ -75,7 +81,7 @@ set(CHAIN MicroHttpd)
 
 ExternalProject_Add(OpenSubdiv
     GIT_REPOSITORY https://github.com/PixarAnimationStudios/OpenSubdiv
-    GIT_TAG 82ab1b9f54c87fdd7e989a3470d53e137b8ca270 # v3_4_3
+    GIT_TAG 8ffa2b6566be10209529d7a0d1db02a0796b160c # v3_5_0
     INSTALL_DIR ${InstallRoot}
     CMAKE_ARGS
       -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
@@ -113,9 +119,9 @@ ExternalProject_Add(OpenVDB
     GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/openvdb
     GIT_TAG 88ae51a34ca70a23442dc60bba83894f35f7f728 # v8.2.0
     INSTALL_DIR ${InstallRoot}
-    CMAKE_ARGS 
-        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-        -DBLOSC_ROOT=/usr
+    CMAKE_ARGS
+      -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+      -DBLOSC_ROOT=/usr
     DEPENDS ${CHAIN}
 )
 set(CHAIN OpenVDB)
@@ -124,7 +130,7 @@ ExternalProject_Add(Log4CPlus
     GIT_REPOSITORY https://github.com/log4cplus/log4cplus
     GIT_TAG bd2dfe9ef0817277a7d41fadecd84addaf943fe3 # REL_1_1_2
     INSTALL_DIR ${InstallRoot}
-    CMAKE_ARGS 
+    CMAKE_ARGS
         -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     DEPENDS ${CHAIN}
 )
@@ -152,7 +158,6 @@ ExternalProject_Add(Random123
 set(CHAIN Random123)
 
 ExternalProject_Add(ISPC
-    # URL https://github.com/ispc/ispc/releases/download/v1.14.1/ispc-v1.14.1-linux.tar.gz
     URL https://github.com/ispc/ispc/releases/download/v1.20.0/ispc-v1.20.0-linux.tar.gz
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ""
@@ -164,17 +169,16 @@ set(CHAIN ISPC)
 
 ExternalProject_Add(embree
     GIT_REPOSITORY https://github.com/embree/embree
-#    GIT_TAG 69bd4c272f1ed608494f233ecfff3feec516880b # v3.12.1
-    GIT_TAG 698442324ccddd11725fb8875275dc1384f7fb40 # v3.13.5
-    PATCH_COMMAND patch -p1 < ${THIS_DIR}/embree_missing_type.patch
+    GIT_TAG 0fcb306c9176221219dd15e27fe0527ed334948f # v4.1.0
     INSTALL_DIR ${InstallRoot}
-    CMAKE_ARGS 
+    CMAKE_ARGS
         -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
         -DEMBREE_ISPC_EXECUTABLE=<INSTALL_DIR>/bin/ispc
+        -DEMBREE_ISPC_SUPPORT=ON
         -DEMBREE_TBB_ROOT=<INSTALL_DIR>
         -DEMBREE_IGNORE_INVALID_RAYS=ON
         -DEMBREE_RAY_MASK=ON
-        -DEMBREE_MAX_ISA=AVX
+        -DEMBREE_MAX_ISA=AVX512
         -DEMBREE_TUTORIALS=OFF
         -DBUILD_SHARED_LIBS=ON
     DEPENDS ${CHAIN}
@@ -196,7 +200,7 @@ set(CHAIN OpenColorIO)
 
 ExternalProject_Add(OpenImageIO
     GIT_REPOSITORY https://github.com/OpenImageIO/oiio
-    GIT_TAG 55ebad1f77f06527b23b4fe9d0da81fe8d0ecdc8 # 2.2.15.1
+    GIT_TAG 331a323468928c8017ad048b26d47c4e57a724a7 # 2.3.20.0
     INSTALL_DIR ${InstallRoot}
     CMAKE_ARGS
         -DOpenEXR_ROOT=<INSTALL_DIR>
@@ -210,6 +214,7 @@ set(CHAIN OpenImageIO)
 ExternalProject_Add(OpenImageDenoise
     URL https://github.com/OpenImageDenoise/oidn/releases/download/v2.0.1/oidn-2.0.1.src.tar.gz
     INSTALL_DIR ${InstallRoot}
+    PATCH_COMMAND patch devices/cpu/CMakeLists.txt ${THIS_DIR}/oidn_find_tbb.patch
     CMAKE_ARGS
         -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
         -DISPC_EXECUTABLE=<INSTALL_DIR>/bin/ispc
@@ -221,7 +226,6 @@ set(CHAIN OpenImageDenoise)
 
 ExternalProject_Add(USD
     GIT_REPOSITORY https://github.com/PixarAnimationStudios/USD
-    # GIT_TAG 7a5f8c4311fed3ef2271d5e4b51025fb0f513730 # v21.08
     GIT_TAG 3b097e3ba8fabf1777a1256e241ea15df83f3065 # v22.05
     INSTALL_DIR ${InstallRoot}
     CMAKE_ARGS
@@ -236,8 +240,10 @@ ExternalProject_Add(USD
         -DPXR_ENABLE_PTEX_SUPPORT=OFF
         -DPXR_ENABLE_OPENVDB_SUPPORT=OFF
         -DPXR_BUILD_USDVIEW=OFF
-        -DBoost_NO_BOOST_CMAKE=ON 
+        -DBoost_NO_BOOST_CMAKE=ON
         -DBoost_NO_SYSTEM_PATHS=ON
+        -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1
     DEPENDS ${CHAIN}
 )
+set(CHAIN USD)
 
diff --git a/building/Centos7/centos7_container_build.md b/building/Centos7/centos7_container_build.md
@@ -89,6 +89,13 @@ Render prep time = 00:00:00.008
 00:00:01  671.2 MB | Total time                       = 00:00:01.442000
 Wrote /tmp/rectangle.exr
 ```
+
+Note: when running hd_render or other tools, you may see an error like this:
+
+**hd_render: symbol lookup error: /usr/local/lib/libusd_usdGeom.so: undefined symbol: _ZdaPvm**
+
+This can occur because devtoolset-9 contains a conflicting version of the TBB library (libtbb.so.2) in /opt/rh/devtoolset-9/root/usr/lib64/dyninst. To fix the error, either modify LD_LIBRARY_PATH to remove the "dyninst" directories, or simply type "exit" to leave the devtoolset-9 environment (then source setup.sh again).
+
 ---
 ## Step 4 : Commit container
 ---

diff --git a/building/Centos7/install_packages.sh b/building/Centos7/install_packages.sh
@@ -29,7 +29,7 @@ yum install -y devtoolset-9 devtoolset-9-gcc \
 yum install -y bison flex  wget git python3 python3-devel \
                    patch giflib-devel libmng libtiff-devel libjpeg-devel \
                    libatomic libcgroup-devel libuuid-devel \
-                   openssl-devel curl-devel
+                   openssl-devel curl-devel freetype-devel
 
 # not required if you are not building with GPU support
 if [ $install_cuda -eq 1 ] 

diff --git a/building/Centos7/oidn_find_tbb.patch b/building/Centos7/oidn_find_tbb.patch
@@ -0,0 +1,9 @@
+5c5
+< find_package(TBB 2017.0 REQUIRED tbb CONFIG)
+---
+> find_package(TBB REQUIRED)
+139c139
+< endif()
+\ No newline at end of file
+---
+> endif()
diff --git a/building/Rocky9/CMakeLists.txt b/building/Rocky9/CMakeLists.txt
@@ -16,7 +16,7 @@ set(InstallRoot /usr/local CACHE FILEPATH "Install root for dependencies")
 
 ExternalProject_Add(JsonCpp
     GIT_REPOSITORY https://github.com/open-source-parsers/jsoncpp.git
-    GIT_TAG ba3fd412929ec4822788b401298e8d9e4950cbab # 0.10.7  
+    GIT_TAG 5defb4ed1a4293b8e2bf641e16b156fb9de498cc # 1.9.5
     INSTALL_DIR ${InstallRoot}
     CMAKE_ARGS
         -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
@@ -28,9 +28,10 @@ set(CHAIN JsonCpp)
 
 ExternalProject_Add(OpenSubdiv
     GIT_REPOSITORY https://github.com/PixarAnimationStudios/OpenSubdiv
-    GIT_TAG 82ab1b9f54c87fdd7e989a3470d53e137b8ca270 # v3_4_3
+    GIT_TAG 8ffa2b6566be10209529d7a0d1db02a0796b160c # v3_5_0
     INSTALL_DIR ${InstallRoot}
     CMAKE_ARGS
+      -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
       -DCMAKE_BUILD_TYPE=Release
       -DPYTHON_EXECUTABLE=/usr/bin/python3
       -DNO_PTEX=1 -DNO_OMP=1 -DNO_TBB=1 -DNO_CUDA=1 -DNO_GLFW_X11=1 -DNO_DOC=1
@@ -43,7 +44,9 @@ set(CHAIN OpenSubdiv)
 ExternalProject_Add(OpenEXR
     GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/openexr
     GIT_TAG 8bc3741131db146ad08a5b83af9e6e48f0e94a03 # v2.5.7
+    INSTALL_DIR ${InstallRoot}
     CMAKE_ARGS
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
         -DBUILD_SHARED_LIBS=OFF
     DEPENDS ${CHAIN}
 )
@@ -55,32 +58,32 @@ ExternalProject_Add(Random123
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
-    INSTALL_COMMAND make install-include
+    INSTALL_COMMAND make install-include prefix=${InstallRoot}
     DEPENDS ${CHAIN}
 )
 set(CHAIN Random123)
 
 ExternalProject_Add(ISPC
-    # URL https://github.com/ispc/ispc/releases/download/v1.14.1/ispc-v1.14.1-linux.tar.gz
     URL https://github.com/ispc/ispc/releases/download/v1.20.0/ispc-v1.20.0-linux.tar.gz
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
-    INSTALL_COMMAND cp bin/ispc /usr/local/bin
+    INSTALL_COMMAND cp bin/ispc ${InstallRoot}/bin
     DEPENDS ${CHAIN}
 )
 set(CHAIN ISPC)
 
 ExternalProject_Add(embree
     GIT_REPOSITORY https://github.com/embree/embree
-    # GIT_TAG 69bd4c272f1ed608494f233ecfff3feec516880b # v3.12.1
-    GIT_TAG 698442324ccddd11725fb8875275dc1384f7fb40 # v3.13.5
-    PATCH_COMMAND patch -p1 < ${THIS_DIR}/embree_missing_type.patch
-    CMAKE_ARGS 
-        -DEMBREE_ISPC_EXECUTABLE=/usr/local/bin/ispc
+    GIT_TAG 0fcb306c9176221219dd15e27fe0527ed334948f # v4.1.0
+    INSTALL_DIR ${InstallRoot}
+    CMAKE_ARGS
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+        -DEMBREE_ISPC_EXECUTABLE=<INSTALL_DIR>/bin/ispc
+        -DEMBREE_ISPC_SUPPORT=ON
         -DEMBREE_IGNORE_INVALID_RAYS=ON
         -DEMBREE_RAY_MASK=ON
-        -DEMBREE_MAX_ISA=AVX
+        -DEMBREE_MAX_ISA=AVX512
         -DEMBREE_TUTORIALS=OFF
         -DBUILD_SHARED_LIBS=ON
     DEPENDS ${CHAIN}
@@ -90,7 +93,9 @@ set(CHAIN embree)
 ExternalProject_Add(OpenColorIO
     GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/OpenColorIO
     GIT_TAG 056b7b0cb0d087961e9dba75104820e44faf52a1 # v2.0.2
+    INSTALL_DIR ${InstallRoot}
     CMAKE_ARGS
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
         -DBUILD_SHARED_LIBS=ON
         -DOCIO_BUILD_STATIC=OFF
         -DCMAKE_CXX_STANDARD=17
@@ -100,9 +105,11 @@ set(CHAIN OpenColorIO)
 
 ExternalProject_Add(OpenImageIO
     GIT_REPOSITORY https://github.com/OpenImageIO/oiio
-    GIT_TAG 331a323468928c8017ad048b26d47c4e57a724a7 # 2.3.10.0
+    GIT_TAG 331a323468928c8017ad048b26d47c4e57a724a7 # 2.3.20.0
+    INSTALL_DIR ${InstallRoot}
     CMAKE_ARGS
-        -DCMAKE_INSTALL_PREFIX:PATH=/usr/local
+        -DOpenEXR_ROOT=<INSTALL_DIR>
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
         -DUSE_QT=0
         -DUSE_PYTHON=0
     DEPENDS ${CHAIN}
@@ -111,30 +118,31 @@ set(CHAIN OpenImageIO)
 
 ExternalProject_Add(OpenImageDenoise
     URL https://github.com/OpenImageDenoise/oidn/releases/download/v2.0.1/oidn-2.0.1.src.tar.gz
+    INSTALL_DIR ${InstallRoot}
     CMAKE_ARGS
-        -DISPC_EXECUTABLE=/usr/local/bin/ispc
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+        -DISPC_EXECUTABLE=<INSTALL_DIR>/bin/ispc
+        -DTBB_ROOT=<INSTALL_DIR>
         -DOIDN_APPS=OFF
     DEPENDS ${CHAIN}
 )
 set(CHAIN OpenImageDenoise)
 
 ExternalProject_Add(USD
     GIT_REPOSITORY https://github.com/PixarAnimationStudios/USD
-    # GIT_TAG 7a5f8c4311fed3ef2271d5e4b51025fb0f513730 # v21.08
-    # GIT_TAG 3b097e3ba8fabf1777a1256e241ea15df83f3065 # v22.05
     GIT_TAG 0c7b9a95f155c221ff7df9270a39a52e3b23af8b # v22.11
+    INSTALL_DIR ${InstallRoot}
     CMAKE_ARGS
+        -DCMAKE_PREFIX_PATH=<INSTALL_DIR>
         -DPXR_ENABLE_PYTHON_SUPPORT=ON
         -DPXR_USE_PYTHON_3=ON
-        -DPYTHON_LIBRARIES=/usr/lib64 
+        -DPYTHON_LIBRARIES=/usr/lib64
         -DPYTHON_INCLUDE_DIRS=/usr/include
-        -DBoost_NO_BOOST_CMAKE=ON 
-        -DBoost_NO_SYSTEM_PATHS=ON
-        -DBoost_LIBRARY_DIR=/usr/lib64 
-        -DBoost_INCLUDE_DIR=/usr/include  
+        -DBoost_LIBRARY_DIR=/usr/lib64
+        -DBoost_INCLUDE_DIR=/usr/include
         -DTBB_USE_DEBUG_BUILD=OFF
-        -DTBB_ROOT_DIR=/usr 
-        -DTBB_LIBRARIES=/usr/lib64 
+        -DTBB_ROOT_DIR=/usr
+        -DTBB_LIBRARIES=/usr/lib64
         -DTBB_INCLUDE_DIRS=/usr/include ..
         -DPXR_BUILD_TESTS=OFF
         -DPXR_BUILD_EXAMPLES=OFF
@@ -143,7 +151,10 @@ ExternalProject_Add(USD
         -DPXR_ENABLE_PTEX_SUPPORT=OFF
         -DPXR_ENABLE_OPENVDB_SUPPORT=OFF
         -DPXR_BUILD_USDVIEW=OFF
-
+        -DBoost_NO_BOOST_CMAKE=ON
+        -DBoost_NO_SYSTEM_PATHS=ON
+        -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1
     DEPENDS ${CHAIN}
 )
 set(CHAIN USD)
+
diff --git a/moonray/hydra/hdMoonray b/moonray/hydra/hdMoonray
diff --git a/moonray/mcrt_denoise b/moonray/mcrt_denoise
diff --git a/moonray/moonray b/moonray/moonray
diff --git a/moonray/moonray_arras/mcrt_computation b/moonray/moonray_arras/mcrt_computation
diff --git a/moonray/moonray_arras/mcrt_dataio b/moonray/moonray_arras/mcrt_dataio
diff --git a/moonray/moonray_arras/mcrt_messages b/moonray/moonray_arras/mcrt_messages
diff --git a/moonray/moonray_gui b/moonray/moonray_gui
diff --git a/moonray/moonshine b/moonray/moonshine
diff --git a/moonray/moonshine_usd b/moonray/moonshine_usd
diff --git a/moonray/scene_rdl2 b/moonray/scene_rdl2
diff --git a/package.py b/package.py
@@ -44,7 +44,7 @@ def version():
     'boost',
     'cuda-12.1.0.x',
     'curl_no_ldap-7.49.1.x',
-    'embree-3.13.5.x',
+    'embree-4.1.0.x',
     'jsoncpp-1.9.5',
     'libmicrohttpd-0.9.71.x.1',
     'log4cplus-1.1.2.x',