Merge pull request #695 from LuxCoreRender/for_v2.11

For v2.11

Author: howetuft

.github/workflows/sample-builder.yml

@@ -43,7 +43,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        os: [ubuntu-latest, windows-latest, macos-15, macos-15-intel]
     env:
       BUILD_TYPE: Release
       #CXX_VERSION: 20
@@ -96,7 +96,7 @@ jobs:
             version = input_version
           else:
             # Fall back to default
-            build_settings_file = Path("build-helpers", "build-settings.json")
+            build_settings_file = Path("build-system", "build-settings.json")
             with open(build_settings_file) as in_file:
               default_version = json.load(in_file)["DefaultVersion"]
             version = ".".join(default_version[i] for i in ("major", "minor", "patch"))
@@ -191,20 +191,56 @@ jobs:
             core.exportVariable('MACOSX_DEPLOYMENT_TARGET', target);
             core.exportVariable('PKG_ARCH', arch);
 
+      - name: Prepare MacOS
+        if: runner.os == 'macOS'
+        shell: bash
+        run: |
+            # We make conan believe we use apple-clang (see profiles), but
+            # actually we use recent version of llvm, to get full compatibility
+            # with C++20 (in particular: joining threads)
+
+            # llvm
+            brew install llvm@20
+            LLVM_PREFIX=$(brew --prefix llvm@20)
+            echo "CC=clang" >> $GITHUB_ENV
+            echo "CXX=clang++" >> $GITHUB_ENV
+            echo "AR=llvm-ar" >> $GITHUB_ENV
+            echo "RANLIB=llvm-ranlib" >> $GITHUB_ENV
+
+            # lld
+            brew install lld@20
+            LLD_PREFIX=$(brew --prefix lld@20)
+
+            # Set paths
+            echo "PATH=${LLVM_PREFIX}/bin:${LLD_PREFIX}/bin:$PATH" >> $GITHUB_ENV
+            echo "DYLD_LIBRARY_PATH=${LLVM_PREFIX}/lib:${LLD_PREFIX}/lib:${DYLD_LIBRARY_PATH}" >> $GITHUB_ENV
+
+            # Set flags
+            echo "LDFLAGS=${LD_FLAGS} -fuse-ld=${LLD_PREFIX}/bin/ld64.lld -L${LLVM_PREFIX}/lib -L${LLD_PREFIX}/lib" >> $GITHUB_ENV
+            echo "CPPFLAGS=${CPPFLAGS} -I${LLVM_PREFIX}/include -I${LLD_PREFIX}/include" >> $GITHUB_ENV
+
+            # OpenMP
+            brew install libomp
+            echo "OpenMP_ROOT=$(brew --prefix libomp)" >> $GITHUB_ENV
+
       - name: Build (Windows)
         if: runner.os == 'Windows'
         shell: cmd
         env:
           CONAN_HOME: ${{ github.workspace }}\.conan2
         run: |
-          pip install conan && make deps && make luxcore && make luxcoreui && make luxcoreconsole
+          rem We have to install 'wheel', despite it is useless for samples,
+          rem Otherwise 'make deps' will complain
+
+          pip install conan && pip install wheel && make deps && make luxcore && make luxcoreui && make luxcoreconsole
 
       - name: Build (MacOS)
         if: runner.os == 'macOS'
         shell: bash
         run: |
-          pip install conan
-          make deps
+          # We have to install 'wheel', despite it is useless for samples,
+          # otherwise make deps will complain
+          pip install conan && pip install wheel && make deps
           make luxcore
           make luxcoreui
           make luxcoreconsole
@@ -221,14 +257,19 @@ jobs:
             manylinux-interpreters ensure cp313-cp313
             PATH=/opt/python/cp313-cp313/bin:$PATH
             which python
+
+            # We have to install 'wheel', despite it is useless for samples,
+            # otherwise make deps will complain
             python -m pip install conan
+            python -m pip install wheel
 
             # Install toolchain (gcc, ccache...)
             CC=/opt/rh/gcc-toolset-14/root/usr/bin/gcc
             CXX=/opt/rh/gcc-toolset-14/root/usr/bin/g++
             export CMAKE_C_COMPILER_LAUNCHER=ccache
             export CMAKE_CXX_COMPILER_LAUNCHER=ccache
             export VERBOSE=1
+            dnf install -y sudo
             #export CLICOLOR_FORCE=1
 
             # Install conda

.github/workflows/wheel-builder.yml

@@ -58,15 +58,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-minor: [9, 10, 11, 12, 13]
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
-        #python-minor: [ 9 ]
-        #python-minor: [ 12]
-        #os: [macos-14]
-        #python-minor: [ 11]
-        #os: [windows-latest]
-        #python-minor: [ 11]
-        #os: [macos-13]
+        python-minor: [10, 11, 12, 13, 14]
+        os: [ubuntu-latest, windows-latest, macos-15-intel, macos-15]
     env:
       # Reminder: report all variables here to CIBW_ENVIRONMENT_PASS_LINUX
       BUILD_TYPE: ${{ github.event.inputs.build-type || 'Release' }}
@@ -89,14 +82,14 @@ jobs:
 
       - name: Checkout main repository (standard context)
         if: ${{ !env.ACT }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: ${{ inputs.repository }}
           ref: ${{ inputs.ref }}
 
       - name: Checkout main repository (act context)
         if: env.ACT
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Get current commit
         id: current-commit
@@ -126,7 +119,7 @@ jobs:
             echo "CONAN_HOME=${_conan_home}" >> $GITHUB_ENV
 
       - name: Configure ccache
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const workspace = String.raw`${{ github.workspace }}`;
@@ -135,7 +128,7 @@ jobs:
                 'cache-variant': String.raw`ccache`,
                 'CMAKE_CXX_COMPILER_LAUNCHER': String.raw`ccache`,
                 'CMAKE_C_COMPILER_LAUNCHER': String.raw`ccache`,
-                'CCACHE_CONFIGPATH': String.raw`${workspace}/build-helpers/ccache.conf`,
+                'CCACHE_CONFIGPATH': String.raw`${workspace}/build-system/ccache.conf`,
                 'CCACHE_DIR': String.raw`${workspace}/.ccache`,
                 'CCACHE_DEBUGDIR': String.raw`${workspace}/ccache-debug`,
                 'CCACHE_LOGFILE': String.raw`${workspace}/ccache.log`
@@ -153,7 +146,7 @@ jobs:
           sudo apt-get update -y
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1
         with:
           create-symlink: false
           variant: ${{ env.cache-variant }}
@@ -181,42 +174,66 @@ jobs:
 
       - name: Set MacOS deployment target and other set-ups
         if: runner.os == 'macOS'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
+          # Minimum targets driven by:
+          # Intel: libomp
+          # Arm: opensubdiv
           script: |
             if ('${{ runner.arch }}' == 'X64') {
-              target = '10.15';
+              target = '14.0';  // Required by libomp
               arch='x86_64';
             }
-            else if ('${{ env.PYTHON_MINOR }}' != '8') {
-              target = '11.0';
-              arch='armv8';
-            }
             else {
-              target = '12.0';
+              target = '15.0';  // Required by libomp
               arch='armv8';
             }
             core.exportVariable('MACOSX_DEPLOYMENT_TARGET', target);
+            core.exportVariable('CMAKE_OSX_DEPLOYMENT_TARGET', target);
             core.exportVariable('PKG_ARCH', arch);
 
       - name: Prepare MacOS
         if: runner.os == 'macOS'
         shell: bash
         run: |
-            _T=$(brew --prefix llvm@15)
-            echo "CXX=${_T}/bin/clang++" >> $GITHUB_ENV
-            echo "CC=${_T}/bin/clang" >> $GITHUB_ENV
-            #echo "AR=${_T}/bin/ar" >> $GITHUB_ENV
-            #echo "RANLIB=${_T}/bin/ranlib" >> $GITHUB_ENV
-            echo "LDFLAGS=-fuse-ld=$_T/bin/ld64.lld" >> $GITHUB_ENV
+            # We make conan believe we use apple-clang (see profiles), but
+            # actually we use recent version of llvm, to get full compatibility
+            # with C++20 (in particular: joining threads)
+
+            # llvm
+            brew install llvm@20
+            brew link llvm@20 --overwrite
+            LLVM_PREFIX=$(brew --prefix llvm@20)
+            echo "CC=clang" >> $GITHUB_ENV
+            echo "CXX=clang++" >> $GITHUB_ENV
+            echo "AR=llvm-ar" >> $GITHUB_ENV
+            echo "RANLIB=llvm-ranlib" >> $GITHUB_ENV
+
+            # lld
+            brew install lld@20
+            brew link lld@20 --overwrite
+            LLD_PREFIX=$(brew --prefix lld@20)
+
+            # Set paths
+            echo "PATH=${LLVM_PREFIX}/bin:${LLD_PREFIX}/bin:$PATH" >> $GITHUB_ENV
+            echo "DYLD_LIBRARY_PATH=${LLVM_PREFIX}/lib:${LLD_PREFIX}/lib:${DYLD_LIBRARY_PATH}" >> $GITHUB_ENV
+
+            # Set flags
+            echo "LDFLAGS=${LD_FLAGS} -fuse-ld=${LLD_PREFIX}/bin/ld64.lld -L${LLVM_PREFIX}/lib -L${LLD_PREFIX}/lib" >> $GITHUB_ENV
+            echo "CPPFLAGS=${CPPFLAGS} -I${LLVM_PREFIX}/include -I${LLD_PREFIX}/include" >> $GITHUB_ENV
+
+            # OpenMP
+            brew install libomp
+            brew link libomp --overwrite
+            echo "OpenMP_ROOT=$(brew --prefix libomp)" >> $GITHUB_ENV
 
 
       # TODO: The following block is an ugly hack but, at the moment (2025-02-25),
       # scikit-build-core lacks a preset parameter, so this is the only way
       # I found to pass a calculated environment var to CMake build step
       - name: Set M4 env var
         if: runner.os != 'Windows'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             if ('${{ runner.arch }}' == 'X64') {
@@ -235,7 +252,7 @@ jobs:
           if (input_version := "${{ inputs.release-version }}"):
             result = input_version
           else:
-            build_settings_file = Path("build-helpers", "build-settings.json")
+            build_settings_file = Path("build-system", "build-settings.json")
             with open(build_settings_file) as in_file:
               default_version = json.load(in_file)["DefaultVersion"]
             result = ".".join(default_version[i] for i in ("major", "minor", "patch"))
@@ -257,7 +274,7 @@ jobs:
 
       # Build wheel
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.22.0
+        uses: pypa/cibuildwheel@v3.4.0
         env:
           CIBW_BUILD_FRONTEND: build
           CIBW_BUILD_VERBOSITY: 1
@@ -270,6 +287,7 @@ jobs:
             SKBUILD_CMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
             GH_TOKEN=${{ secrets.GITHUB_TOKEN }}
             LUX_BUILD_TYPE=${{ env.BUILD_TYPE }}
+            DEPS_WITHOUT_SUDO=1
           CIBW_ENVIRONMENT_PASS_LINUX: |
             CC
             CXX
@@ -295,6 +313,7 @@ jobs:
             dnf install -y almalinux-release-devel
             dnf install -y ccache
             dnf install -y perl-IPC-Cmd perl-Digest-SHA
+            dnf install -y ninja-build
 
             # Install gh (via conda)
             dnf install -y wget
@@ -313,13 +332,13 @@ jobs:
             fi
 
             # Install dependencies
-            pip install conan && make deps
+            pip install "conan==2.21" && pip install wheel && make deps
 
           CIBW_BEFORE_ALL_MACOS: |
-            pip install conan && make deps
+            pip install "conan==2.21" && pip install wheel && make deps
 
           CIBW_BEFORE_ALL_WINDOWS: |
-            pip install conan && make deps
+            pip install "conan==2.21" && pip install wheel && make deps
 
 
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: |
@@ -339,7 +358,7 @@ jobs:
               {wheel}
 
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: |
-            bash.exe ${{ env.WORKSPACE }}/build-helpers/wheels/repair_wheel_windows.sh '{wheel}' '{dest_dir}' '%VCToolsRedistDir%%Platform%' '${{ env.WORKSPACE }}'
+            bash.exe ${{ env.WORKSPACE }}/build-system/wheels/repair_wheel_windows.sh '{wheel}' '{dest_dir}' '%VCToolsRedistDir%%Platform%' '${{ env.WORKSPACE }}'
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: |
             cp {wheel} ${{ env.WORKSPACE }}
             paths=$(find ${{ env.WORKSPACE }} -type d -wholename "*/lib" -print0 | xargs -0 realpath | tr "\n" ":")
@@ -351,9 +370,16 @@ jobs:
           CIBW_TEST_COMMAND_LINUX: pyluxcoretest
           CIBW_TEST_COMMAND_WINDOWS: pyluxcoretest
           CIBW_TEST_COMMAND_MACOS: |
-            if [[ ${{ matrix.os }} == 'macos-13' ]]; then
-              # Only for Intel: ARM runner raises an OpenCL driver issue
+            if [[ ${{ matrix.os }} == 'macos-15-intel' ]]; then
+              # Full test for Intel
+              echo "Testing x86_64"
               pyluxcoretest
+            elif [[ ${{ matrix.os }} == 'macos-15' ]]; then
+              # Light test, as ARM runner raises an OpenCL driver issue otherwise
+              echo "Testing arm"
+              python -c "import pyluxcore"
+            else
+              echo "UNHANDLED OS"
             fi
           CIBW_CONTAINER_ENGINE: >
             docker;
@@ -369,7 +395,7 @@ jobs:
       - name: Save dependency cache
         if: always()
         id: cache-deps-save
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         with:
           path: conan-cache
           key: deps-${{ matrix.os }}-${{ matrix.python-minor}}-${{ hashFiles('**/conan-cache') }}
@@ -379,7 +405,7 @@ jobs:
         #uses: mxschmitt/action-tmate@v3
 
       # Upload artifacts
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         id: upload
         with:
           name: cibw-wheels-${{ matrix.os }}-${{ matrix.python-minor }}
@@ -395,7 +421,7 @@ jobs:
       attestation-url: ${{ steps.attestation-step.outputs.attestation-url }}
 
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v7
         if: ${{ !env.ACT }}
         with:
           pattern: cibw-wheels-*
@@ -405,6 +431,6 @@ jobs:
       - name: Generate artifact attestations
         id: attestation-step
         if: ${{ !env.ACT }}
-        uses: actions/attest-build-provenance@v2
+        uses: actions/attest-build-provenance@v3
         with:
           subject-path: ${{ github.workspace }}/dist/*

.gitignore

@@ -9,6 +9,7 @@ doc/
 generated/
 lib/
 nbproject/
+.cache/
 deps/perceptualdiff-master/libpdiff.a
 samples/(benchsimple|smallluxgpu)/(Debug|Release)/
 samples/luxcoreui/deps/glfw-3.1.1/src/glfw_config.h
@@ -36,7 +37,7 @@ compile_commands.json
 dist
 samples/pyluxcoretool/__pycache__
 release_OSX/
-build-helpers/make/__pycache__
+build-system/make/__pycache__
 *.pyc
 
 ###########################
@@ -99,3 +100,4 @@ CMakeUserPresets.json
 # Visual Studio (Code)
 .vs/
 .vscode/
+tags