Merge branch 'RB-10.4' into tmpRB-10.3

Author: ivanimanishi

.github/workflows/main.yml

@@ -33,48 +33,55 @@ jobs:
           linux-python2,
           linux-python2-debug,
           linux-python3,
-          macos-python2
+          windows-python3,
+          windows-python3-debug
         ]
 
         include:
 
           - name: linux-python2
             os: ubuntu-20.04
             buildType: RELEASE
-            containerImage: ghcr.io/gafferhq/build/build:1.2.0
+            containerImage: ghcr.io/gafferhq/build/build:2.0.0
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/4.0.0/gafferDependencies-4.0.0-Python2-linux.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.1.0/gafferDependencies-5.1.0-Python2-linux.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
             publish: true
 
           - name: linux-python2-debug
             os: ubuntu-20.04
             buildType: DEBUG
-            containerImage: ghcr.io/gafferhq/build/build:1.2.0
+            containerImage: ghcr.io/gafferhq/build/build:2.0.0
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/4.0.0/gafferDependencies-4.0.0-Python2-linux.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.1.0/gafferDependencies-5.1.0-Python2-linux.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
             publish: false
 
           - name: linux-python3
             os: ubuntu-20.04
             buildType: RELEASE
-            containerImage: ghcr.io/gafferhq/build/build:1.2.0
+            containerImage: ghcr.io/gafferhq/build/build:2.0.0
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/4.0.0/gafferDependencies-4.0.0-Python3-linux.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.1.0/gafferDependencies-5.1.0-Python3-linux.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
             publish: true
 
-          - name: macos-python2
-            os: macos-10.15
+          - name: windows-python3
+            os: windows-2019
             buildType: RELEASE
-            containerImage:
-            options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/4.0.0/gafferDependencies-4.0.0-Python2-osx.tar.gz
-            # `testAppleseed` currently omitted due to clashes with system image IO frameworks.
+            options: .github/workflows/main/options.windows
+            dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.2.0/gafferDependencies-6.2.0-Python3-windows.zip
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: true
 
+          - name: windows-python3-debug
+            os: windows-2019
+            buildType: RELWITHDEBINFO
+            options: .github/workflows/main/options.windows
+            dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.2.0/gafferDependencies-6.2.0-Python3-windows.zip
+            tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
+            publish: false
+
     runs-on: ${{ matrix.os }}
 
     container: ${{ matrix.containerImage }}
@@ -88,7 +95,10 @@ jobs:
         sdk: 10.0.17763.0
 
     - name: Install toolchain (Windows)
-      run: python -m pip install scons
+      run: |
+        python -m pip install scons
+        echo "PACKAGE_COMMAND=7z a -tzip" >> $env:GITHUB_ENV
+        echo "PACKAGE_EXTENSION=zip" >> $env:GITHUB_ENV
       if: runner.os == 'Windows'
 
     - name: Install toolchain (MacOS)
@@ -102,11 +112,25 @@ jobs:
         # _before_ anything we specify with `-isystem`, despite documentation to the
         # contrary. So we nuke the headers.
         rm -rf /usr/local/include/*
+        echo PACKAGE_COMMAND=tar -czf >> $GITHUB_ENV
+        echo PACKAGE_EXTENSION=tar.gz >> $GITHUB_ENV
       if: runner.os == 'macOS'
 
     - name: Install toolchain (Linux)
       run: |
-        echo /opt/rh/devtoolset-6/root/bin >> $GITHUB_PATH
+        # The Docker container configures bash shells such that they enable the
+        # software collections we want. If we could set GitHub's
+        # `defaults.run.shell` to `bash` then all our build steps would pick up
+        # this environment automatically. But we can't do that because it
+        # breaks the build on Windows, and we can't configure a different shell
+        # per platform because GitHub won't allow it. But we can run _this_
+        # Linux-only step in bash, and transfer the environment out to be used
+        # in later steps.
+        echo $PATH > $GITHUB_PATH
+        echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH >> $GITHUB_ENV
+        echo PACKAGE_COMMAND=tar -czf >> $GITHUB_ENV
+        echo PACKAGE_EXTENSION=tar.gz >> $GITHUB_ENV
+      shell: bash
       if: runner.os == 'Linux'
 
     - name: Install Python Modules
@@ -137,7 +161,7 @@ jobs:
       shell: bash
 
     - name: Cache
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: sconsCache
         key: ${{ runner.os }}-${{ matrix.containerImage }}-${{env.CORTEX_DEPENDENCIES_HASH}}-${{ matrix.buildType }}-${{ github.sha }}
@@ -146,32 +170,50 @@ jobs:
 
     - name: Build
       run: |
-       scons -j 2 install BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} CXXSTD=c++14 BUILD_CACHEDIR=sconsCache
+       scons -j 2 install BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} BUILD_CACHEDIR=sconsCache
+       # Copy the config log for use in the "Debug Failures" step, because it
+       # gets clobbered by the `scons test*` call below.
+       cp config.log buildConfig.log
 
     - name: Test
       run: |
-        scons ${{ matrix.tests }} BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} CXXSTD=c++14 BUILD_CACHEDIR=sconsCache
+        scons ${{ matrix.tests }} BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} BUILD_CACHEDIR=sconsCache
       env:
         IECORE_RTLD_GLOBAL: 0
+        OCIO: ${{ env.CORTEX_BUILD_NAME }}/openColorIO/config.ocio
 
     - name: Build Package
       run: |
-       tar -czf ${{ env.CORTEX_BUILD_NAME }}.tar.gz ${{ env.CORTEX_BUILD_NAME }}
+       ${{ env.PACKAGE_COMMAND }} ${{ env.CORTEX_BUILD_NAME }}.${{env.PACKAGE_EXTENSION}} ${{ env.CORTEX_BUILD_NAME }}
       if: matrix.publish
 
     - uses: actions/upload-artifact@v2
       with:
         name: ${{ env.CORTEX_BUILD_NAME }}
-        path: ${{ env.CORTEX_BUILD_NAME }}.tar.gz
+        path: ${{ env.CORTEX_BUILD_NAME }}.${{ env.PACKAGE_EXTENSION }}
       if: matrix.publish
 
     - name: Publish Release
       run: |
-        ./.github/workflows/main/publishRelease.py --archive ${{ env.CORTEX_BUILD_NAME }}.tar.gz --repo ${{ github.repository }} --releaseId ${{ env.CORTEX_GITHUB_RELEASEID }}
-      if: matrix.publish && env.CORTEX_GITHUB_RELEASEID != '' && runner.os != 'Windows'
+        python ./.github/workflows/main/publishRelease.py --archive ${{ env.CORTEX_BUILD_NAME }}.${{ env.PACKAGE_EXTENSION }} --repo ${{ github.repository }} --releaseId ${{ env.CORTEX_GITHUB_RELEASEID }}
+      if: matrix.publish && env.CORTEX_GITHUB_RELEASEID != ''
 
       env:
         GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Limit cache size
       run: python ./.github/workflows/main/limitCacheSize.py
+
+    - name: Debug Failures
+      run: |
+        # Give MacOS crash reporter time to do its thing
+        sleep 20
+        # Print SCons logs and MacOS crash logs
+        shopt -s nullglob
+        for logFile in config.log buildConfig.log ~/Library/Logs/DiagnosticReports/*.crash
+        do
+         echo $logFile
+         cat $logFile
+        done
+      shell: bash
+      if: failure()

.github/workflows/main/options.posix

@@ -45,7 +45,7 @@ BOOST_LIB_SUFFIX = ""
 
 OPENEXR_INCLUDE_PATH = includes
 OIIO_INCLUDE_PATH = includes
-OIIO_LIB_PATH = libs
+OIIO_LIB_PATH = ""
 OSL_INCLUDE_PATH = includes
 BLOSC_INCLUDE_PATH = includes
 FREETYPE_INCLUDE_PATH = includes + "/freetype2"
@@ -57,7 +57,9 @@ WITH_GL = "1"
 GLEW_INCLUDE_PATH = includes + "/GL"
 
 TBB_INCLUDE_PATH = includes
+
 USD_INCLUDE_PATH = includes
+USD_LIB_PREFIX = "usd_"
 
 # Renderers
 # =========

.github/workflows/main/options.windows

@@ -13,14 +13,6 @@ INSTALL_RMANDISPLAY_NAME = build + "\\renderMan\\displayDrivers\\ieDisplay"
 INSTALL_PYTHON_DIR = build + "\\python"
 INSTALL_IECORE_OPS = ""
 
-# disable permissive mode, making MSVC more standards compliant
-# /D_USE_MATH_DEFINES is needed with permissive mode off for
-# common definitions like M_P
-# /Zc:externC- fixes a compilation error with Boost::interprocess
-# described here:
-# https://developercommunity.visualstudio.com/content/problem/756694/including-windowsh-and-boostinterprocess-headers-l.html
-CXXFLAGS = ["/permissive-", "/D_USE_MATH_DEFINES", "/Zc:externC-"]
-
 LIBPATH = libs
 
 PYTHON = deps + "\\bin\\python"
@@ -33,8 +25,9 @@ PYTHONPATH = deps + "\\python"
 # Libs
 # ====
 
-BOOST_INCLUDE_PATH = includes + "\\boost-1_68"
-BOOST_LIB_SUFFIX = "-vc141-mt-x64-1_68"
+BOOST_INCLUDE_PATH = includes
+BOOST_LIB_SUFFIX = ""
+BOOST_LIB_PATH = libs
 
 OPENEXR_INCLUDE_PATH = includes
 OIIO_INCLUDE_PATH = includes + "\\OpenImageIO"
@@ -53,6 +46,7 @@ GLEW_LIB_SUFFIX = "32"
 TBB_INCLUDE_PATH = includes
 USD_INCLUDE_PATH = includes
 USD_LIB_PATH = libs
+USD_LIB_PREFIX = "usd_"
 DOXYGEN = deps + "\\doxygen\\doxygen.exe"
 
 # Renderers
@@ -76,5 +70,5 @@ WARNINGS_AS_ERRORS = "1"
 
 # PATH is needed to locate the MSVC compiler. PROCESSOR_ARCHITECTURE and USERNAME
 # are needed by the HeaderGenerator and accompanying tests.
-ENV_VARS_TO_IMPORT = "PATH PROCESSOR_ARCHITECTURE USERNAME CI"
+ENV_VARS_TO_IMPORT = "PATH PROCESSOR_ARCHITECTURE USERNAME CI OCIO"
 

.gitignore

@@ -7,6 +7,13 @@
 *.pyc
 *.dylib
 *.code-workspace
+*.obj
+*.pyd
+*.pdb
+*.dll
+*.lib
+*.ilk
+*.exp
 .sconsign.dblite
 .sconf_temp
 .cproject
@@ -24,19 +31,8 @@ config.log
 mayaLog
 projects
 test/IECore/IECoreTest
-test/IECore/results.txt
-test/IECore/resultsPython.txt
-test/IECoreImage/results.txt
-test/IECoreVDB/resultsPython.txt
-test/IECoreRI/resultsPython.txt
-test/IECoreMaya/resultsPython.txt
-test/IECoreNuke/resultsPython.txt
-test/IECoreHoudini/resultsPython.txt
-contrib/IECoreMantra/test/IECoreMantra/results.txt
-contrib/IECoreAppleseed/test/IECoreAppleseed/results.txt
-contrib/IECoreAlembic/test/IECoreAlembic/resultsPython.txt
-contrib/IECoreArnold/test/IECoreArnold/results.txt
-contrib/IECoreUSD/test/IECoreUSD/resultsPython.txt
+test/*/results*.txt
+contrib/*/test/*/results*.txt
 /.ubuntu
 /dependencies
 .idea/