Try to fix CI

bathal1 · bathal1 · commit c22f63185260 · 2025-08-06T09:21:44.000+02:00
diff --git a/.github/workflows/build_mitsuba_ubuntu/action.yml b/.github/workflows/build_mitsuba_ubuntu/action.yml
@@ -0,0 +1,66 @@
+name: Build Mitsuba 3 on Ubuntu
+inputs:
+  github_token:
+    required: true
+    description: "GitHub token defined by the workflow"
+runs:
+  using: composite
+  steps:
+  - name: Install Mitsuba build dependencies
+    shell: bash
+    run: |
+      sudo apt update
+      sudo apt install -y cmake ccache ninja-build libpng-dev libjpeg-dev 
+      python -m pip install setuptools typing_extensions numpy
+
+  - name: Restore ccache
+    id: cache-mitsuba
+    uses: actions/cache/restore@v4
+    with:
+      path: |
+        ~/.cache
+        mitsuba3/build
+      key: build-ubuntu-${{ github.run_id }}
+      restore-keys: |
+        build-ubuntu-
+
+  - name: Checkout Mitsuba 3 repo
+    uses: actions/checkout@v4
+    with:
+      repository: wjakob/nanobind
+      # repository: mitsuba-renderer/mitsuba3
+      path: mitsuba3
+      submodules: recursive
+      fetch-depth: 0
+
+  - name: Restore timestamps 
+    uses: chetan/git-restore-mtime-action@v2
+    with:
+      working-directory: mitsuba3
+
+
+  - name: Build Mitsuba 3
+    shell: bash
+    run: |
+      cd mitsuba3
+      mkdir -p build
+      export CCACHE_BASEDIR="$GITHUB_WORKSPACE"
+      export CCACHE_NOHASHDIR=1
+      export CCACHE_DEBUG=1
+      export CMAKE_CXX_COMPILER_LAUNCHER=ccache
+      export CCACHE_DEBUGDIR=$GITHUB_WORKSPACE/ccache-debug
+      ccache -s
+      cd build
+      cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release 
+      ninja -d explain
+      ccache -s
+
+  - name: Store ccache
+    if: always()
+    uses: actions/cache/save@v4
+    with:
+      key: build-ubuntu-${{ github.run_id }}
+      path: |
+        ~/.cache
+        mitsuba3/build
+
diff --git a/.github/workflows/build_mitsuba_windows/action.yml b/.github/workflows/build_mitsuba_windows/action.yml
@@ -0,0 +1,37 @@
+name: Build Mitsuba 3 on Windows
+runs:
+  using: composite
+  steps:
+  - name: Install Mitsuba build dependencies
+    shell: bash
+    run: |
+      choco install ninja cmake
+      python -m pip install setuptools typing_extensions numpy
+
+  - name: Checkout Mitsuba 3 repo
+    uses: actions/checkout@v4
+    with:
+      repository: mitsuba-renderer/mitsuba3
+      path: mitsuba3
+      submodules: recursive
+
+  - name: Restore Mitsuba 3 build
+    uses: actions/cache/restore@v4
+    with:
+      key: mitsuba-build-windows
+      path: mitsuba3/build
+
+  - name: Build Mitsuba 3
+    shell: bash
+    run: |
+      cd mitsuba3
+      cmake -B build -DCMAKE_BUILD_TYPE=Release
+      cmake --build build --config Release --parallel
+
+  - name: Cache Mitsuba 3 build
+    if: always()
+    uses: actions/cache/save@v4
+    with:
+      key: mitsuba-build-windows
+      path: mitsuba3/build
+
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,8 +7,7 @@ name: Test suite
 on:
   push:
     branches:
-      - "*"
-      - "!master"
+      - master
   pull_request:
     branches: [ master ]
   workflow_call:
@@ -27,29 +26,34 @@ jobs:
           os: "ubuntu-latest",
           mitsuba-version: "3.5.0"
         }
-        - {
-          os: "windows-latest",
-          mitsuba-version: "3.5.0"
-        }
+        # - {
+        #   os: "windows-latest",
+        #   mitsuba-version: "3.5.0"
+        # }
         blender:
         - {
-          version: "3.6"
+          version: "3.6",
+          python-version: "3.10"
         }
         - {
-          version: "4.2"
-        }
-        - {
-          version: "4.4"
+          version: "4.2",
+          python-version: "3.11"
         }
+        # - {
+        #   version: "4.4",
+        #   python-version: "3.11"
+        # }
     steps:
     - name: Git checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Setup Python
       uses: "actions/setup-python@v2"
+      with:
+        python-version: ${{ matrix.blender.python-version }}
 
     - name: Install Python dependencies
-      run: python -m pip install --upgrade requests
+      run: python -m pip install --upgrade requests 
 
     - name: Retrieve Blender full version
       id: blender-version
@@ -68,6 +72,26 @@ jobs:
       if: steps.cache-blender.outputs.cache-hit != 'true'
       run: python scripts/blender_downloader.py ${{ matrix.blender.version }} -o blender
 
+    - name: Check if mitsuba_version branch
+      id: check-branch
+      shell: bash
+      run: |
+        if [[ "${{ github.head_ref || github.ref_name }}" == mitsuba_version* ]]; then
+          echo "::set-output name=is_mitsuba_version::true"
+        else
+          echo "::set-output name=is_mitsuba_version::false"
+        fi
+
+    - name: Build Mitsuba if needed (Ubuntu)
+      if: steps.check-branch.outputs.is_mitsuba_version == 'true' && matrix.environment.os == 'ubuntu-latest'
+      uses: ./.github/workflows/build_mitsuba_ubuntu
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build Mitsuba if needed (Windows)
+      if: steps.check-branch.outputs.is_mitsuba_version == 'true' && matrix.environment.os == 'windows-latest'
+      uses: ./.github/workflows/build_mitsuba_windows
+
     - name: Install Blender dependencies
       shell: bash
       run: |
@@ -76,11 +100,23 @@ jobs:
         ./$BLENDER_PYTHON -m ensurepip
         ./$BLENDER_PYTHON -m pip install -U pip
         ./$BLENDER_PYTHON -m pip install --upgrade pytest pytest-cov
-        ./$BLENDER_PYTHON -m pip install mitsuba==${{ matrix.environment.mitsuba-version }} --force-reinstall
+        if [[ "${{ steps.check-branch.outputs.is_mitsuba_version }}" == "true" ]]; then
+          echo "Using local Mitsuba build"
+          export PYTHONPATH="$PWD/mitsuba3/build/python:$PYTHONPATH"
+        else
+          echo "Using PyPI Mitsuba"
+          ./$BLENDER_PYTHON -m pip install mitsuba==${{ matrix.environment.mitsuba-version }} --force-reinstall
+        fi
 
     - name: Run Addon test suite
       shell: bash
       run: |
         BLENDER_EXECUTABLE=$(find blender/ -maxdepth 1 -regextype posix-extended -regex '.*blender(.exe)?' -print -quit)
         echo "Blender Executable is $BLENDER_EXECUTABLE"
-        ./$BLENDER_EXECUTABLE -b -noaudio --factory-startup --python scripts/run_tests.py -- -v --cov=mitsuba-blender
+        if [[ "${{ steps.check-branch.outputs.is_mitsuba_version }}" == "true" ]]; then
+          echo "Running tests with local Mitsuba build"
+          ./$BLENDER_EXECUTABLE -b -noaudio --factory-startup --python scripts/run_tests.py --mitsuba "$PWD/mitsuba3/build" -- -v --cov=mitsuba-blender
+        else
+          echo "Running tests with PyPI Mitsuba"
+          ./$BLENDER_EXECUTABLE -b -noaudio --factory-startup --python scripts/run_tests.py -- -v --cov=mitsuba-blender
+        fi
diff --git a/mitsuba-blender/io/exporter/materials.py b/mitsuba-blender/io/exporter/materials.py
@@ -234,35 +234,23 @@ def convert_mix_materials_cycles(export_ctx, current_node):#TODO: test and fix t
         }
         return params
     elif mat_I.type != 'EMISSION' and mat_II.type != 'EMISSION':
-
+        # TODO: When we can process textures in-memory, support exporting mask BSDFs
         weight = convert_color_texture_node(export_ctx, current_node.inputs['Fac'])
-
-        if mat_I.type == 'BSDF_TRANSPARENT' or mat_II.type == 'BSDF_TRANSPARENT':
-            #FIXME: What if the transparent opacity is not 1?
-            params = {
-                'type': 'mask',
-                'opacity': weight
-            }
-            other_mat = mat_II if mat_I.type == 'BSDF_TRANSPARENT' else mat_I
-            mat_params = cycles_material_to_dict(export_ctx, other_mat)
-            params.update([('bsdf', mat_params)])
-
-        else:
-            params = {
-                'type': 'blendbsdf',
-                'weight': weight
-            }
-            # add first material
-            mat_A = cycles_material_to_dict(export_ctx, mat_I)
-            params.update([
-                ('bsdf1', mat_A)
-            ])
-
-            # add second material
-            mat_B = cycles_material_to_dict(export_ctx, mat_II)
-            params.update([
-                ('bsdf2', mat_B)
-            ])
+        params = {
+            'type': 'blendbsdf',
+            'weight': weight
+        }
+        # add first material
+        mat_A = cycles_material_to_dict(export_ctx, mat_I)
+        params.update([
+            ('bsdf1', mat_A)
+        ])
+
+        # add second material
+        mat_B = cycles_material_to_dict(export_ctx, mat_II)
+        params.update([
+            ('bsdf2', mat_B)
+        ])
 
         return params
     else:#one bsdf, one emitter
@@ -341,12 +329,16 @@ def convert_transparent_materials_cycles(export_ctx, current_node):
         # a texture. This will be doable once we convert textures in-memory instead
         # of on-disk (cf PR #121).
         export_ctx.log("Transparent BSDF: opacity textures are currently not supported. Consider using a Mix Shader instead.", 'WARN')
-    opacity_bl = list(current_node.inputs['Color'].default_value)
+    bl_opacity = current_node.inputs['Color'].default_value
+    if min(bl_opacity) == 1.0:
+        # Completely transparent, export a null material
+        return {'type': 'null'}
+
     # Invert the opacity value to match Mitsuba's convention
-    opacity_mi = [*[1.0 - x for x in opacity_bl[:3]], opacity_bl[3]]
+    mi_opacity = [*[1.0 - x for x in bl_opacity[:3]], bl_opacity[3]]
     params = {
         'type': 'mask',
-        'opacity': export_ctx.spectrum(opacity_mi),
+        'opacity': export_ctx.spectrum(mi_opacity),
         'bsdf': {
             'type': 'diffuse',
             'reflectance': export_ctx.spectrum(0.0)
diff --git a/mitsuba-blender/io/importer/materials.py b/mitsuba-blender/io/importer/materials.py
@@ -500,8 +500,8 @@ def write_mi_mask_bsdf(mi_context, mi_mat, bl_mat_wrap, out_socket_id, mi_bump=N
         mi_context.log(f'Unexpected number of child BSDFs in mask BSDF. Expected 1 but got {mi_child_mats_count}.', 'ERROR')
         return False
 
-    mi_child_mats = [mi_context.mi_state.nodes[i].props for i in mi_child_ids]
-    if mi_child_mats[0].plugin_name() == 'diffuse' and mi_child_mats[0].get_texture('reflectance').max() == 0:
+    mi_child_mat = mi_context.mi_state.nodes[mi_child_ids[0]].props
+    if mi_child_mat.plugin_name() == 'diffuse' and mi_child_mat.get_texture('reflectance').max() == 0:
         # This can simply be a transparent material.
         bl_transparent = bl_mat_wrap.ensure_node_type([out_socket_id], 'ShaderNodeBsdfTransparent', 'BSDF')
         bl_transparent_wrap = bl_shader_utils.NodeMaterialWrapper(bl_mat_wrap.bl_mat, out_node=bl_transparent)
@@ -528,7 +528,7 @@ def write_mi_mask_bsdf(mi_context, mi_mat, bl_mat_wrap, out_socket_id, mi_bump=N
         write_mi_float_property(mi_context, mi_mat, 'opacity', bl_mix_wrap, 'Fac', 0.5)
         # Add a transparent node to the top socket of the mix shader
         bl_mix_wrap.ensure_node_type(['Shader'], 'ShaderNodeBsdfTransparent', 'BSDF')
-        write_mi_material_to_node_graph(mi_context, mi_child_mats[0], bl_mix_wrap, 'Shader_001', mi_bump=mi_bump, mi_normal=mi_normal)
+        write_mi_material_to_node_graph(mi_context, mi_child_mat, bl_mix_wrap, 'Shader_001', mi_bump=mi_bump, mi_normal=mi_normal)
 
     return True
 
