Skip to content

Commit 354b28b

Browse files
authored
Merge branch 'main' into slesTEST
2 parents f65ffcd + cfc99b7 commit 354b28b

24 files changed

+594
-88
lines changed

.github/workflows/nightly.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@ jobs:
466466
with:
467467
provider: "LEVEL_ZERO"
468468
runner: "L0-BMG"
469-
os: "['Ubuntu']"
470469
CUDA:
471470
uses: ./.github/workflows/reusable_gpu.yml
472471
with:

.github/workflows/reusable_basic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ jobs:
281281
# Ensure that the required environment is set
282282
# Note: While this step is required for the clang-cl compiler, it can be executed for all jobs
283283
- name: Setup MSVC dev command prompt
284-
uses: TheMrMilchmann/setup-msvc-dev@fb19abb8a41b3cf0340f5d1be17d420309232be6 # v3.0.1
284+
uses: TheMrMilchmann/setup-msvc-dev@79dac248aac9d0059f86eae9d8b5bfab4e95e97c # v4.0.0
285285
with:
286286
arch: x64
287287

.github/workflows/reusable_benchmarks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
echo "bench_params=$params" >> $GITHUB_ENV
6060
6161
- name: Add comment to PR
62-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
62+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
6363
if: ${{ always() && inputs.pr_no != 0 }}
6464
with:
6565
script: |
@@ -214,7 +214,7 @@ jobs:
214214
run: cat ${{ github.workspace }}/benchmark_results.md || true
215215

216216
- name: Add comment to PR
217-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
217+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
218218
if: ${{ always() && inputs.pr_no != 0 }}
219219
with:
220220
script: |

.github/workflows/reusable_checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
./scripts/check_license/check_headers.sh . "Apache-2.0 WITH LLVM-exception" -v
5858
5959
- name: Run a spell check
60-
uses: crate-ci/typos@52bd719c2c91f9d676e2aa359fc8e0db8925e6d8 # v1.35.3
60+
uses: crate-ci/typos@85f62a8a84f939ae994ab3763f01a0296d61a7ee # v1.36.2
6161
with:
6262
config: ./.github/workflows/.spellcheck-conf.toml
6363

.github/workflows/reusable_codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
fetch-depth: 0
3737

3838
- name: Setup newer Python
39-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
39+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
4040
with:
4141
python-version: "3.10"
4242

4343
- name: Initialize CodeQL
44-
uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
44+
uses: github/codeql-action/init@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
4545
with:
4646
languages: cpp
4747
trap-caching: false
@@ -108,7 +108,7 @@ jobs:
108108
run: cmake --build ${{env.BUILD_DIR}} --config Release -j
109109

110110
- name: Perform CodeQL Analysis
111-
uses: github/codeql-action/analyze@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
111+
uses: github/codeql-action/analyze@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
112112

113113
- name: "[Win] Prepare vcpkg cache"
114114
if: matrix.os == 'windows-latest' && steps.cache.outputs.cache-hit != 'true'

.github/workflows/reusable_docs_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@ jobs:
7878
7979
- name: Upload artifact
8080
if: ${{ inputs.upload == true }}
81-
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
81+
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
8282
with:
8383
path: build/docs_build/generated/html

.github/workflows/reusable_trivy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fetch-depth: 0
2222

2323
- name: Run Trivy
24-
uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4 # v0.32.0
24+
uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # v0.33.1
2525
with:
2626
scan-type: 'config'
2727
hide-progress: false
@@ -38,6 +38,6 @@ jobs:
3838
cat trivy-results.sarif
3939
4040
- name: Upload results
41-
uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
41+
uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
4242
with:
4343
sarif_file: 'trivy-results.sarif'

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ jobs:
4949

5050
# Upload the results to GitHub's code scanning dashboard.
5151
- name: Upload to code-scanning
52-
uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
52+
uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
5353
with:
5454
sarif_file: scorecard_results.sarif

CMakeLists.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,8 @@ if(UMF_LINK_HWLOC_STATICALLY)
280280
endif()
281281

282282
message(
283-
STATUS "Will fetch hwloc from ${UMF_HWLOC_REPO} (tag: ${UMF_HWLOC_TAG})"
283+
STATUS
284+
"Will fetch hwloc from ${UMF_HWLOC_REPO} (tag: ${UMF_HWLOC_TAG}) and link it statically"
284285
)
285286

286287
if(WINDOWS)
@@ -309,6 +310,14 @@ if(UMF_LINK_HWLOC_STATICALLY)
309310
set(LIBHWLOC_INCLUDE_DIRS ${hwloc_targ_BINARY_DIR}/include)
310311
set(LIBHWLOC_FOUND TRUE)
311312
else() # not Windows
313+
find_program(AUTORECONF_EXECUTABLE autoreconf)
314+
if(NOT AUTORECONF_EXECUTABLE)
315+
message(
316+
FATAL_ERROR
317+
"autoreconf is not installed, but it's needed in hwloc configure step. "
318+
"Either install it, or set UMF_LINK_HWLOC_STATICALLY=OFF and install hwloc >= 2.3.0 in your system."
319+
)
320+
endif()
312321
FetchContent_Declare(
313322
hwloc_targ
314323
GIT_REPOSITORY ${UMF_HWLOC_REPO}

src/base_alloc/base_alloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static void ba_divide_memory_into_chunks(umf_ba_pool_t *pool, void *ptr,
128128
current_chunk->next = NULL;
129129
pool->metadata.free_list = ptr; // address of the first chunk
130130

131-
// mark the memory as unaccessible again
131+
// mark the memory as inaccessible again
132132
utils_annotate_memory_inaccessible(ptr, size);
133133
}
134134

0 commit comments

Comments
 (0)