Sampling refactor for pt

.github/workflows/build-nabla.yml

@@ -31,7 +31,7 @@ jobs:
       matrix:
         # vendor: [msvc, clangcl]
         # TODO: Yas please fix ClangCL, we have a few new compile errors
-        # if we build MSVC then build "run-compiler-explorer" target, for ClangCL build just "nsc"
+        # build full Nabla preset, run-compiler-explorer is pulled in via ALL when Docker integration is enabled
         vendor: [msvc]
         config: [Release, Debug, RelWithDebInfo]
         tag: ['17.13.6']
@@ -50,9 +50,35 @@ jobs:
             Set-MpPreference -DisableArchiveScanning $true
             Set-MpPreference -DisableScanningMappedNetworkDrivesForFullScan $true
 
-            if (-not (docker network ls --format '{{.Name}}' | Where-Object { $_ -eq 'docker_default' })) {
-              docker network create --driver nat docker_default
-              if ($LASTEXITCODE -ne 0) { exit 1 }
+            $maxAttempts = 12
+            $delaySeconds = 5
+            $dockerReady = $false
+
+            for ($attempt = 1; $attempt -le $maxAttempts; $attempt++) {
+              $networkNames = docker network ls --format '{{.Name}}'
+              if ($LASTEXITCODE -eq 0) {
+                if (-not ($networkNames | Where-Object { $_ -eq 'docker_default' })) {
+                  docker network create --driver nat docker_default
+                  if ($LASTEXITCODE -eq 0) {
+                    $dockerReady = $true
+                    break
+                  }
+                }
+                else {
+                  $dockerReady = $true
+                  break
+                }
+              }
+
+              if ($attempt -lt $maxAttempts) {
+                Write-Host "Docker not ready yet (attempt $attempt/$maxAttempts), retry in ${delaySeconds}s..."
+                Start-Sleep -Seconds $delaySeconds
+              }
+            }
+
+            if (-not $dockerReady) {
+              Write-Error "Docker was not ready after $($maxAttempts*$delaySeconds)s total wait"
+              exit 1
             }
 
       - name: Set prefix
@@ -122,22 +148,17 @@ jobs:
           docker exec orphan `
             ${{ env.entry }} ${{ env.cmd }} -Command cmake `
               --preset ci-configure-dynamic-${{ matrix.vendor }} `
+              -DCMAKE_INSTALL_PREFIX:PATH=C:/mount/nabla/build-ct/install `
               --profiling-output=profiling/cmake-profiling.json `
               --profiling-format=google-trace
 
-      - name: Container – Build NSC
+      - name: Container – Build & Install Nabla
         run: |
           docker exec orphan `
             ${{ env.entry }} ${{ env.cmd }} -Command cmake --build `
               --preset ci-build-dynamic-${{ matrix.vendor }} `
-              -t run-compiler-explorer --config ${{ matrix.config }}
-
-      - name: Container – Install Nabla
-        run: |
-          docker exec orphan `
-            ${{ env.entry }} ${{ env.cmd }} -Command cmake --install `
-              ${{ env.binary }} --config ${{ matrix.config }} `
-              --prefix ${{ env.install }}
+              --target install `
+              --config ${{ matrix.config }}
 
       - name: API / Examples / Check Run (Create)
         id: check-run-create
@@ -390,11 +411,11 @@ jobs:
           if (-not (Test-Path "smoke/build-ct/install")) { throw "smoke/build-ct/install not found" }
           tree.com smoke /F
 
-      - name: Configure Smoke
-        run: cmake -S smoke -B smoke/out
+      - name: Smoke Flow MINIMALISTIC
+        run: cmake -D FLOW=MINIMALISTIC -D CONFIG=${{ matrix.config }} -P smoke/RunSmokeFlow.cmake
 
-      - name: Build Smoke
-        run: cmake --build smoke/out --config ${{ matrix.config }}
+      - name: Smoke Flow CONFIGURE_ONLY
+        run: cmake -D FLOW=CONFIGURE_ONLY -D CONFIG=${{ matrix.config }} -P smoke/RunSmokeFlow.cmake
 
-      - name: CTest Smoke
-        run: ctest --verbose --test-dir smoke/out --force-new-ctest-process --output-on-failure --no-tests=error -C ${{ matrix.config }}
+      - name: Smoke Flow BUILD_ONLY
+        run: cmake -D FLOW=BUILD_ONLY -D CONFIG=${{ matrix.config }} -P smoke/RunSmokeFlow.cmake

.github/workflows/run-nsc.yml

@@ -51,9 +51,35 @@ jobs:
             Set-MpPreference -DisableArchiveScanning $true
             Set-MpPreference -DisableScanningMappedNetworkDrivesForFullScan $true
 
-            if (-not (docker network ls --format '{{.Name}}' | Where-Object { $_ -eq 'docker_default' })) {
-              docker network create --driver nat docker_default
-              if ($LASTEXITCODE -ne 0) { exit 1 }
+            $maxAttempts = 12
+            $delaySeconds = 5
+            $dockerReady = $false
+
+            for ($attempt = 1; $attempt -le $maxAttempts; $attempt++) {
+              $networkNames = docker network ls --format '{{.Name}}'
+              if ($LASTEXITCODE -eq 0) {
+                if (-not ($networkNames | Where-Object { $_ -eq 'docker_default' })) {
+                  docker network create --driver nat docker_default
+                  if ($LASTEXITCODE -eq 0) {
+                    $dockerReady = $true
+                    break
+                  }
+                }
+                else {
+                  $dockerReady = $true
+                  break
+                }
+              }
+
+              if ($attempt -lt $maxAttempts) {
+                Write-Host "Docker not ready yet (attempt $attempt/$maxAttempts), retry in ${delaySeconds}s..."
+                Start-Sleep -Seconds $delaySeconds
+              }
+            }
+
+            if (-not $dockerReady) {
+              Write-Error "Docker was not ready after $($maxAttempts*$delaySeconds)s total wait"
+              exit 1
             }
 
             $sendDiscord = "${{ inputs.withDiscordMSG }}" -eq "true"

3rdparty/CMakeLists.txt

@@ -530,9 +530,6 @@ nbl_install_dir(imath/src/Imath)
 
 nbl_install_file(blake/c/blake3.h)
 
-nbl_install_file_spec(nlohmann_json/include/nlohmann/json_fwd.hpp nlohmann)
-nbl_install_file_spec(nlohmann_json/include/nlohmann/detail/abi_macros.hpp nlohmann/detail)
-
 nbl_install_dir(boost/superproject/libs/preprocessor/include/boost)
 
 nbl_install_file_spec(renderdoc/renderdoc_app.h renderdoc)

CMakePresets.json

@@ -295,7 +295,32 @@
 				"CMAKE_BUILD_TYPE": "Debug",
 				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
-		}
+		},
+		{
+            "name": "n4ce-configure-windows-msvc",
+            "hidden": false,
+            "binaryDir": "build/production/n4ce",
+            "cacheVariables": {
+                "NBL_STATIC_BUILD": "OFF",
+				"NBL_SKIP_BUILD_OPTIONS_VALIDATION": "ON",
+                "CMAKE_SUPPRESS_REGENERATION": "OFF",
+                "NBL_COMPILER_DYNAMIC_RUNTIME": "ON",
+                "NBL_EMBED_BUILTIN_RESOURCES": "ON",
+                "NBL_UPDATE_GIT_SUBMODULE": "OFF",
+                "NBL_COMPILE_WITH_CUDA": "OFF",
+                "NBL_BUILD_OPTIX": "OFF",
+                "NBL_BUILD_MITSUBA_LOADER": "OFF",
+                "NBL_BUILD_RADEON_RAYS": "OFF",
+                "_NBL_COMPILE_WITH_OPEN_EXR_": "ON",
+                "NBL_EXPLICIT_MODULE_LOAD_LOG": "ON",
+                "NBL_CPACK_NO_BUILD_DIRECTORY_MODULES": "ON",
+                "GIT_FAIL_IF_NONZERO_EXIT": "OFF"
+            },
+            "displayName": "[N4CE]: Dynamic library target, Visual Studio 17 2022 generator, MSVC v143 toolset",
+            "description": "Configure as dynamic library with Visual Studio 17 2022 generator and MSVC v143 toolset",
+            "generator": "Visual Studio 17 2022",
+            "toolset": "v143"
+        }
 	],
 	"buildPresets": [
 		{