Install tbb in CI using vcpkg

Signed-off-by: Lukasz Dorau <[email protected]>

Author: ldorau

.github/workflows/basic.yml

@@ -178,7 +178,7 @@ jobs:
   windows-build:
     name: Windows
     env:
-      HWLOC_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows"
+      VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows"
     strategy:
       matrix:
         os: ['windows-2019', 'windows-2022']
@@ -229,7 +229,7 @@ jobs:
         cmake
         -B ${{env.BUILD_DIR}}
         ${{matrix.toolset}}
-        -DCMAKE_PREFIX_PATH=${{env.HWLOC_PATH}}
+        -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
         -DCMAKE_C_COMPILER=${{matrix.compiler.c}}
         -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
         -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}}

.github/workflows/benchmarks.yml

@@ -74,7 +74,8 @@ jobs:
     name: Windows
     env:
       BUILD_DIR : "${{github.workspace}}/build/"
-      HWLOC_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows"
+      VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows"
+      VCPKG_PATH_BIN: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows/bin;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows/bin"
     strategy:
       fail-fast: false
       matrix:
@@ -104,7 +105,7 @@ jobs:
         -B ${{env.BUILD_DIR}}
         -DCMAKE_C_COMPILER=${{matrix.compiler.c}}
         -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
-        -DCMAKE_PREFIX_PATH=${{env.HWLOC_PATH}}
+        -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
         -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}}
         -DUMF_BUILD_BENCHMARKS=ON
         -DUMF_BUILD_BENCHMARKS_MT=OFF
@@ -126,6 +127,6 @@ jobs:
       run: |
         # add path to umf.dll
         $env:PATH += ";${{env.BUILD_DIR}}\bin\${{matrix.build_type}}"
-        # add path to hwloc-15.dll
-        $env:PATH += ";${{env.HWLOC_PATH}}\bin"
+        # add path to DLL directories
+        $env:PATH += ";${{env.VCPKG_PATH_BIN}}"
         .\benchmark\${{matrix.build_type}}\ubench.exe

.github/workflows/codeql.yml

@@ -20,7 +20,7 @@ jobs:
     permissions:
       security-events: write
     env:
-      HWLOC_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows"
+      VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows"
     strategy:
       fail-fast: false
       matrix:
@@ -29,7 +29,7 @@ jobs:
           - os: ubuntu-latest
             pool_scalable: 'ON'
             # Windows doesn't recognize 'CMAKE_BUILD_TYPE', it uses '--config' param in build command
-            extra_build_option: ['-DCMAKE_BUILD_TYPE=Release']
+            extra_build_option: '-DCMAKE_BUILD_TYPE=Release'
           - os: windows-latest
             pool_scalable: 'OFF'
     runs-on: ${{matrix.os}}
@@ -70,7 +70,7 @@ jobs:
         cmake
         -B ${{github.workspace}}/build
         ${{matrix.extra_build_option}}
-        -DCMAKE_PREFIX_PATH=${{env.HWLOC_PATH}}
+        -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
         -DUMF_FORMAT_CODE_STYLE=OFF
         -DUMF_DEVELOPER_MODE=ON
         -DUMF_ENABLE_POOL_TRACKING=ON

.github/workflows/pr_push.yml

@@ -14,7 +14,7 @@ jobs:
   FastBuild:
     name: Fast build
     env:
-      HWLOC_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows"
+      VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows"
     strategy:
       matrix:
         include:
@@ -72,7 +72,7 @@ jobs:
       run: >
         cmake
         -B ${{github.workspace}}/build
-        -DCMAKE_PREFIX_PATH=${{env.HWLOC_PATH}}
+        -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
         -DUMF_FORMAT_CODE_STYLE=OFF
         -DUMF_DEVELOPER_MODE=ON
         -DUMF_ENABLE_POOL_TRACKING=ON
@@ -112,6 +112,7 @@ jobs:
         -DUMF_BUILD_OS_MEMORY_PROVIDER=OFF
         -DUMF_BUILD_TESTS=OFF
         -DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
+        -DUMF_BUILD_LIBUMF_POOL_SCALABLE=OFF
 
     - name: Check clang-format
       run: cmake --build build --target clang-format-check

.github/workflows/sanitizers.yml

@@ -111,7 +111,7 @@ jobs:
   windows-build:
     name: cl and clang-cl on Windows
     env:
-      HWLOC_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows"
+      VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows"
     strategy:
       matrix:
         compiler: [{c: cl, cxx: cl}, {c: clang-cl, cxx: clang-cl}]
@@ -152,7 +152,7 @@ jobs:
         -B ${{env.BUILD_DIR}}
         -DCMAKE_C_COMPILER=${{matrix.compiler.c}}
         -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
-        -DCMAKE_PREFIX_PATH=${{env.HWLOC_PATH}}
+        -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
         -DUMF_BUILD_SHARED_LIBRARY=OFF
         -DUMF_ENABLE_POOL_TRACKING=OFF
         -DUMF_FORMAT_CODE_STYLE=OFF

vcpkg.json

@@ -1,7 +1,8 @@
 {
   "name": "main",
-  "version-string": "2.10.0",
+  "version-string": "1.0.0",
   "dependencies": [
-    "hwloc"
+    "hwloc",
+    "tbb"
   ]
 }