corrections v2

Author: rbanka1

.github/docker/ubuntu-20.04.Dockerfile

@@ -56,12 +56,10 @@ COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
 	${BASE_DEPS} \
-	${UMF_DEPS} \
 	${TEST_DEPS} \
 	${MISC_DEPS} \
 	${HWLOC_DEPS} \
- && dos2unix /opt/umf/install_hwloc.sh \
- && bash -x /opt/umf/install_hwloc.sh \
+ && bash /opt/umf/install_hwloc.sh \
  && ldconfig \
  && rm -rf /var/lib/apt/lists/* \
  && apt-get clean all
@@ -70,10 +68,11 @@ RUN apt-get update \
 RUN mkdir -p --mode 777 /opt/umf/
 
 # Additional dependencies (installed via pip)
-COPY third_party/requirements.txt /opt/umf/requirements.txt
 # It's actively used and tested only on selected distros. Be aware
 # they may not work, because pip packages list differ from OS to OS.
+COPY third_party/requirements.txt /opt/umf/requirements.txt
 
+# Add a new (non-root) 'test_user'
 ENV USER test_user
 ENV USERPASS pass
 RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"

.github/docker/ubuntu-22.04.Dockerfile

@@ -12,7 +12,7 @@ FROM registry.hub.docker.com/library/ubuntu@sha256:e6173d4dc55e76b87c4af8db8821b
 
 # Set environment variables
 ENV OS ubuntu
-ENV OS_VER 20.04
+ENV OS_VER 22.04
 ENV NOTTY 1
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -38,7 +38,7 @@ ARG TEST_DEPS="\
 ARG MISC_DEPS="\
 	automake \
 	clang \
-	g++-11 \
+	g++ \
 	python3-pip \
 	sudo \
 	whois \
@@ -56,12 +56,10 @@ COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
 	${BASE_DEPS} \
-	${UMF_DEPS} \
 	${TEST_DEPS} \
 	${MISC_DEPS} \
 	${HWLOC_DEPS} \
- && dos2unix /opt/umf/install_hwloc.sh \
- && bash -x /opt/umf/install_hwloc.sh \
+ && bash /opt/umf/install_hwloc.sh \
  && ldconfig \
  && rm -rf /var/lib/apt/lists/* \
  && apt-get clean all

.github/docker/ubuntu-24.04.Dockerfile

@@ -12,7 +12,7 @@ FROM registry.hub.docker.com/library/ubuntu@sha256:72297848456d5d37d1262630108ab
 
 # Set environment variables
 ENV OS ubuntu
-ENV OS_VER 20.04
+ENV OS_VER 24.04
 ENV NOTTY 1
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -38,7 +38,7 @@ ARG TEST_DEPS="\
 ARG MISC_DEPS="\
 	automake \
 	clang \
-	g++-11 \
+	g++ \
 	python3-pip \
 	sudo \
 	whois \
@@ -56,12 +56,10 @@ COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
 	${BASE_DEPS} \
-	${UMF_DEPS} \
 	${TEST_DEPS} \
 	${MISC_DEPS} \
 	${HWLOC_DEPS} \
- && dos2unix /opt/umf/install_hwloc.sh \
- && bash -x /opt/umf/install_hwloc.sh \
+ && bash /opt/umf/install_hwloc.sh \
  && ldconfig \
  && rm -rf /var/lib/apt/lists/* \
  && apt-get clean all

.github/workflows/build_ci_container.yml renamed to .github/workflows/build_dockers.yml

@@ -10,15 +10,15 @@ permissions:
   contents: read
 
 jobs: 
-  build-ci-container:
+  build-dockers:
     runs-on: ubuntu-latest
     strategy: 
       matrix:
         ubuntu-version: [20.04, 22.04, 24.04]
     outputs: 
       status: ${{ job.status }}
     env:
-      GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
+      GHCR_TOKEN: ${{ secrets.BB_GHCR_TOKEN }} # ${{ secrets.GHCR_TOKEN }}
       IMG: ghcr.io/${{ github.actor }}/umf-ubuntu-${{ matrix.ubuntu-version }}:latest
 
     steps:
@@ -31,8 +31,8 @@ jobs:
         uses: docker/login-action@30f019fb76bb54d03ec1e716054622be511a13b2 # v3.2.0
         with: 
           registry: ghcr.io
-          username: ${{ github.actor }} # ${{ sys_bb-umf }}
-          password: ${{ env.GHCR_TOKEN }}
+          username: ${{ github.bb-ur }} # ${{ github.actor }}
+          password: ${{ env.BB_GHCR_TOKEN }} # ${{ env.GHCR_TOKEN }}
 
       - name: Build and push ubuntu-${{ matrix.ubuntu-version }} Docker image
         run: |

.github/workflows/pr_push.yml

@@ -23,34 +23,45 @@ jobs:
     uses: ./.github/workflows/reusable_docs_build.yml
   DetectChanges:
     runs-on: ubuntu-latest
-    outputs:
-      changed_files: ${{ steps.changed-files.outputs.all_changed_files }}
+    outputs: 
+      changed_files: ${{ steps.get-changes.outputs.all_changed_files }}
     steps:
       - name: Checkout code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
-          fetch-depth: 0
-
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/[email protected]
+          fetch-depth: 2
 
       - name: List all changed files
-        env:
-          ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
+        id: get-changes
+        run: |
+          git diff --name-only HEAD^ HEAD > all_changed_files.txt
+          changed_files=$(cat all_changed_files.txt | tr '\n' ' ')
+          echo "changed_files=$changed_files" >> $GITHUB_ENV
+          echo "::set-output name=all_changed_files::$changed_files"
+
+      - name: all changed files
         run: |
-          echo "Changed files: ${{ steps.changed-files.outputs.all_changed_files }}"
+          echo "changed files: ${{ needs.DetectChanges.outputs.changed_files }}"
+  Check:
+    runs-on: ubuntu-latest
+    needs: [DetectChanges]
+    steps: 
+      - name: check changed files
+        run: |
+          echo "all_changed_files: ${{ needs.DetectChanges.outputs.changed_files }}"
+          echo "all_changed_files: ${{ contains(join(needs.DetectChanges.outputs.changed_files, ' '), '.github/docker/') }}"
+
   BuildDockers:
     if: ${{ contains(join(needs.DetectChanges.outputs.changed_files, ' '), '.github/docker/') }}
     needs: [DetectChanges]
     permissions:
       contents: read
       packages: write
     secrets: inherit
-    uses: ./.github/workflows/build_ci_container.yml
+    uses: ./.github/workflows/build_dockers.yml
   FastBuild:
     if: always() && (needs.BuildDockers.result == 'skipped' || needs.BuildDockers.result == 'success')
-    needs: [CodeChecks, DocsBuild, BuildDockers]
+    needs: [ CodeChecks, DocsBuild, BuildDockers]
     uses: ./.github/workflows/reusable_fast.yml
   Build:
     name: Basic builds

.github/workflows/reusable_basic.yml

@@ -21,7 +21,7 @@ jobs:
       image: ${{ matrix.image }}
       options: --user root --privileged
       volumes:
-        - /home/runner/work/unified-memory-framework/unified-memory-framework:/home/runner/work/unified-memory-framework/unified-memory-framework
+        - ${{ github.workspace }}:${{ github.workspace }}
     strategy:
       matrix:
         image: ['ghcr.io/rbanka1/umf-ubuntu-20.04:latest', 'ghcr.io/rbanka1/umf-ubuntu-22.04:latest' ]
@@ -133,15 +133,6 @@ jobs:
         echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
         sudo apt-get update
         sudo apt-get install -y intel-oneapi-ippcp-devel intel-oneapi-ipp-devel intel-oneapi-common-oneapi-vars intel-oneapi-compiler-dpcpp-cpp
-
-    - name: Install TBB apt package
-      if: matrix.install_tbb == 'OFF'
-      run: |
-        sudo apt-get install -y libtbb-dev
-
-    - name: Install g++-7
-      if: matrix.compiler.cxx == 'g++-7'
-      run: sudo apt-get install -y ${{matrix.compiler.cxx}}
   
     - name: Install libhwloc
       run: .github/scripts/install_hwloc.sh
@@ -505,4 +496,4 @@ jobs:
         --build-type ${{env.BUILD_TYPE}}
         --proxy
         --umf-version ${{env.UMF_VERSION}}
-        --shared-library
+        --shared-library

.github/workflows/reusable_fast.yml

@@ -14,33 +14,30 @@ env:
 jobs:
   ubuntu-build:
     name: Linux
-    runs-on: ubuntu-latest
+    runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-22.04' }}
     container:
       image: ${{ matrix.image }}
       options: --user root --privileged
       volumes:
-        - /home/runner/work/unified-memory-framework/unified-memory-framework:/home/runner/work/unified-memory-framework/unified-memory-framework
-
-    env:
-      VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows"
+        - ${{ github.workspace }}:${{ github.workspace }}
     strategy:
       matrix:
         include:
           - image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
             build_tests: 'ON'
-            extra_build_options: '-DCMAKE_BUILD_TYPE=Release -DUMF_BUILD_BENCHMARKS=ON -DUMF_BUILD_BENCHMARKS_MT=ON'
+            extra_build_options: ' -DUMF_BUILD_BENCHMARKS=ON -DUMF_BUILD_BENCHMARKS_MT=ON'
             simple_cmake: 'OFF'
+          # pure C build
           - image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
             build_tests: 'OFF'
-            extra_build_options: '-DCMAKE_BUILD_TYPE=Release -DUMF_BUILD_BENCHMARKS=ON'
+            extra_build_options: '-DUMF_BUILD_BENCHMARKS=ON'
             simple_cmake: 'OFF'
+          # simplest CMake on ubuntu-latest
           - image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
             build_tests: 'ON'
-            extra_build_options: '-DCMAKE_BUILD_TYPE=Release'
             simple_cmake: 'ON'
           - image: ghcr.io/rbanka1/umf-ubuntu-20.04:latest
             build_tests: 'ON'
-            extra_build_options: '-DCMAKE_BUILD_TYPE=Release'
             simple_cmake: 'ON'
 
     steps:
@@ -54,11 +51,9 @@ jobs:
       run: >
         cmake
         -B ${{env.BUILD_DIR}}
-        -DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
-        -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
+        -DCMAKE_BUILD_TYPE=Release
         -DUMF_FORMAT_CODE_STYLE=OFF
         -DUMF_DEVELOPER_MODE=ON
-        -DUMF_BUILD_LIBUMF_POOL_DISJOINT=${{matrix.disjoint}}
         -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
         -DUMF_BUILD_TESTS=${{matrix.build_tests}}
         -DUMF_BUILD_EXAMPLES=ON
@@ -73,13 +68,12 @@ jobs:
       run: >
         cmake
         -B ${{env.BUILD_DIR}}
-        -DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
         -DUMF_BUILD_SHARED_LIBRARY=ON
         -DUMF_TESTS_FAIL_ON_SKIP=ON
         ${{matrix.extra_build_options}}
 
     - name: Build
-      run: cmake --build ${{env.BUILD_DIR}} --config Release -j
+      run: cmake --build ${{env.BUILD_DIR}} --config Release -j $(nproc)
 
     - name: Run examples
       working-directory: ${{env.BUILD_DIR}}
@@ -99,14 +93,12 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: windows-latest
-            disjoint: 'OFF'
-            build_tests: 'ON'
+          - build_tests: 'ON'
             simple_cmake: 'OFF'
-          - os: windows-latest
-            disjoint: 'OFF'
-            build_tests: 'OFF'
+          - build_tests: 'OFF'
             simple_cmake: 'OFF'
+          # - build_tests: 'OFF'
+          #   simple_cmake: 'ON'
 
     steps:
     - name: Checkout repository
@@ -121,7 +113,7 @@ jobs:
         vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
         vcpkgJsonGlob: '**/vcpkg.json'
 
-    - name: Install dependencies (windows-latest)
+    - name: Install dependencies
       run: vcpkg install
       shell: pwsh 
 
@@ -134,15 +126,13 @@ jobs:
         -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
         -DUMF_FORMAT_CODE_STYLE=OFF
         -DUMF_DEVELOPER_MODE=ON
-        -DUMF_BUILD_LIBUMF_POOL_DISJOINT=${{matrix.disjoint}}
         -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
         -DUMF_BUILD_TESTS=${{matrix.build_tests}}
         -DUMF_BUILD_EXAMPLES=ON
         -DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
         -DUMF_BUILD_CUDA_PROVIDER=ON
         -DUMF_TESTS_FAIL_ON_SKIP=ON
         -DUMF_BUILD_SHARED_LIBRARY=ON
-        ${{matrix.extra_build_options}}
 
     - name: Configure CMake (simple)
       if: matrix.simple_cmake == 'ON'
@@ -152,7 +142,6 @@ jobs:
         -DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
         -DUMF_BUILD_SHARED_LIBRARY=ON
         -DUMF_TESTS_FAIL_ON_SKIP=ON
-        ${{matrix.extra_build_options}}
 
     - name: Build
       run: cmake --build ${{env.BUILD_DIR}} --config Release -j
@@ -170,7 +159,6 @@ jobs:
     # ref. https://superuser.com/questions/381276/what-are-some-nice-command-line-ways-to-inspect-dll-exe-details
 
     - name: Print metadata of our dll's
-      if: matrix.os == 'windows-latest'
       run: |
         get-command ${{github.workspace}}/build/bin/Release/umf.dll | format-list
         get-command ${{github.workspace}}/build/src/proxy_lib/Release/umf_proxy.dll | format-list