OpenSubDiv Conan recipe and TBB

- OpenSubDiv Conan recipe was incorrectly specifying that clients needed to link
against libtbbmalloc and libtbbmalloc_proxy, which could cause mixing of TBB
and glibc malloc. Fixes [#371 usdview core dump](#371).
- docker-builds.yml missing line continuation, would abort trying to build base2 Conan packages due to missing options.
- clean up some bare URLs in README.md
- clean up references to internal Conan paths in installed CPython and USD scripts.
Fixes [#370](#370).

Signed-off-by: Jean-Francois Panisset <panisset@gmail.com>

Author: jfpanisset

.github/workflows/docker-builds.yml

@@ -204,7 +204,7 @@ jobs:
           --verbose \
           build \
           --ci-image-type PACKAGE \
-          --group base2-1
+          --group base2-1 \
           --version ${{ matrix.version_noclang }} \
           --build-missing \
           --push NO

README.md

@@ -336,7 +336,7 @@ The container images include CUDA, OptiX, OpenGL and Vulkan libraries and can be
 
 The host system must have the [NVIDIA Container Toolkit](https://github.com/NVIDIA/nvidia-container-toolkit) installed to allow GPU devices to be mapped into the container and accessible by a binary running inside it. The NVIDIA GPU driver also needs to be installed on the host: the Container Toolkit will map the hardware specific shared libraries into the container at startup time. There is no need to install the GPU driver in the container itself.
 
-Academy Software Foundation projects running their CI in the context of the [https://github.com/AcademySoftwareFoundation/] GitHub organization have access to GPU accelerated hosted runners where the NVIDIA Container Toolkit is already installed.
+Academy Software Foundation projects running their CI in the context of the [ASWF GitHub organization](https://github.com/AcademySoftwareFoundation/) have access to GPU accelerated hosted runners where the NVIDIA Container Toolkit is already installed.
 
 #### CUDA CI Workloads
 
@@ -352,7 +352,7 @@ container:
 
 The[Open Shading Language](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage) optionally uses NVIDIA OptiX for ray tracing acceleration. This requires additional [driver capabilities](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/1.10.0/user-guide.html#driver-capabilities) to be mapped into the container at startup time:
 
-[https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/blob/main/.github/workflows/ci.yml]
+[OpenShadingLanguage .github/workflows/ci.yml](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/blob/main/.github/workflows/ci.yml)
 
 ```
 container:

packages/conan/recipes/opensubdiv/conanfile.py

@@ -190,7 +190,7 @@ def package_info(self):
         self.cpp_info.components["osdcpu"].set_property("cmake_target_name", f"OpenSubdiv::osdcpu{target_suffix}")
         self.cpp_info.components["osdcpu"].libs = ["osdCPU"]
         if self.options.with_tbb:
-            self.cpp_info.components["osdcpu"].requires = ["onetbb::onetbb"]
+            self.cpp_info.components["osdcpu"].requires = ["onetbb::libtbb"] # ASWF: only need libtbb, NOT tbbmalloc/tbbmalloc_proxy
 
         if self._osd_gpu_enabled:
             self.cpp_info.components["osdgpu"].set_property("cmake_target_name", f"OpenSubdiv::osdgpu{target_suffix}")

scripts/common/install_conanpackages.sh

@@ -28,8 +28,8 @@ if (( $VFXYEAR < 2023 )); then
     conan config set general.default_profile=$2
     conan install .
 else
-    # Escape / or & in install dir for use in regexp
-    ESCAPED_PATH=$(printf '%s' "$1" | sed 's/[\/&]/\\&/g')
+    # Escape & in install dir for use in regexp
+    ESCAPED_PATH=$(printf '%s' "$1" | sed 's/[&]/\\&/g')
     # In case we don't actually install anything
     mkdir -p $1/full_deploy/host
     # Extract references from conanfile.txt and install them by reference
@@ -47,11 +47,12 @@ else
     # conan cache clean "*" --download
     rm -rf /tmp/downloads/*
 
-    # The full_deploy generator just copies over generated CMake files which may contain absolute paths pointing inside the Conan cache
+    # The full_deploy generator copies over generated package files which may contain absolute paths pointing inside the Conan cache
     # in the format:
-    # /opt/conan_home/d/b/boost64b7fc4516f80/p/...
+    # /opt/conan_home/d/b/cpyth64b7fc4516f80/p/...
+    # /opt/conan_home/d/cpyth/64b7fc4516f80/p/...
     # Replace those by our installation prefix.
-    find $1/full_deploy -name '*.cmake' -exec sed -i -E 's/\/opt\/conan_home\/d\/b\/[^/]+\/p/'$ESCAPED_PATH'/g' {} \;
+    find $1/full_deploy -name '*.cmake' -exec sed -i -E 's#/opt/conan_home/d/b/[^/]+/p#'"$ESCAPED_PATH"'#g' {} \;
 
     for INSTALLED_PACKAGE in $(find $1/full_deploy/host -mindepth 1 -maxdepth 1 -printf "%f\n"); do
         # Don't relocate the excluded package
@@ -74,15 +75,53 @@ else
         fi
 
         # Currently cannot build a relocatable CPython package, conan_home paths are hardcoded in sysconfig
+        # Also python scripts should not hardcode the Conan package path in their shebang
         if [[ $INSTALLED_PACKAGE == cpython ]]; then
-            find $1/full_deploy/host/cpython -name '_sysconfigdata__linux_x86_64-linux-gnu.py' -exec sed -i -E 's/\/opt\/conan_home\/d\/b\/[^/]+\/p/'$ESCAPED_PATH'/g' {} \;
+            find $1/full_deploy/host/cpython/${INSTALLED_PACKAGE_VERSION}/${RELEASE_DIR} -name '_sysconfigdata__linux_x86_64-linux-gnu.py' -exec sed -i -E 's#/opt/conan_home/d(/b)?/[^/]+/p#'"$ESCAPED_PATH"'#g' {} \;
+            find $1/full_deploy/host/cpython/${INSTALLED_PACKAGE_VERSION}/${RELEASE_DIR}/lib -name '*.py' -exec sed -i -E '1s@^#!/opt/conan_home/d/b/cpyth.*/bin/(.*)$@#!/usr/bin/env \1@'  {} \;
+            for f in $1/full_deploy/host/cpython/${INSTALLED_PACKAGE_VERSION}/${RELEASE_DIR}/bin/*; do
+                [[ -f $f ]] || continue
+                read -r first < "$f" || continue
+                case "$first" in
+                    "#!"*python*)   # any python* interpreter
+                        sed -i -E '1s@^#!/opt/conan_home/d/b/cpyth.*/bin/(.*)$@#!/usr/bin/env \1@' "$f"
+                        ;;
+                    *)
+                        : # not a Python script; skip
+                        ;;
+                esac
+            done
         fi
 
         # One off patch for pybind11 : overwrite pybind11Common.cmake with un-modified version
         if [[ $INSTALLED_PACKAGE == pybind11 ]]; then
             mv $1/full_deploy/host/pybind11/${INSTALLED_PACKAGE_VERSION}/lib/cmake/pybind11/pybind11Common.{cmake_NO_CONAN,cmake}
         fi
 
+        # Qt has scripts which bake in cmake binary location
+        if [[ $INSTALLED_PACKAGE == qt ]]; then
+            for f in $1/full_deploy/host/qt/${INSTALLED_PACKAGE_VERSION}/${RELEASE_DIR}/bin/{qt-cmake,qt-cmake-create}; do
+                [[ -f $f ]] || continue
+                sed -i -E 's#/opt/conan_home/d/b/cmake[^/]+/p#'"$ESCAPED_PATH"'#g' $f
+            done
+        fi
+
+        # OpenUSD installs a number of Python scripts and bakes in the conan cache path in the shebang
+        if [[ $INSTALLED_PACKAGE == openusd ]]; then
+            for f in $1/full_deploy/host/openusd/${INSTALLED_PACKAGE_VERSION}/${RELEASE_DIR}/bin/*; do
+                [[ -f $f ]] || continue
+                read -r first < "$f" || continue
+                case "$first" in
+                    "#!"*python*)   # any python* interpreter
+                        sed -i -E '1s@^#!/opt/conan_home/d/b/cpyth.*/bin/(.*)$@#!/usr/bin/env \1@' "$f"
+                        ;;
+                    *)
+                        : # not a Python script; skip
+                        ;;
+                esac
+            done
+        fi
+
         rsync --remove-source-files --exclude conaninfo.txt --exclude conanmanifest.txt -a $1/full_deploy/host/${INSTALLED_PACKAGE}/${INSTALLED_PACKAGE_VERSION}/${RELEASE_DIR}/ $1/
     done