8000 switch to internal development (#184) · oneapi-src/distributed-ranges@36f94ec · GitHub
[go: up one dir, main page]
Skip to content {"props":{"docsUrl":"https://docs.github.com/get-started/accessibility/keyboard-shortcuts"}}

Commit 36f94ec

Browse files
rscohn2rscohn2
authored
switch to internal development (#184)
1 parent 60050e5 commit 36f94ec

File tree

6 files changed

+32
-182
lines changed

6 files changed

+32
-182
lines changed

‎.github/workflows/devcloud.yml

Lines changed: 0 additions & 76 deletions
This file was deleted.

‎.github/workflows/pr.yml

Lines changed: 23 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,86 +13,65 @@ on:
1313

1414
env:
1515
CTEST_OUTPUT_ON_FAILURE: 1
16-
IMPI: impi@2021.10.0
17-
MKL: mkl@2023.2.0
18-
TBB: tbb@2021.10.0
19-
ICX: icx@2023.2.0
2016

2117
jobs:
2218
checks:
23-
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
19+
runs-on: dds-base
2420
steps:
2521
- uses: actions/checkout@v4
26-
- name: Ubuntu dependencies
27-
run: .github/workflows/setup-docs-ubuntu.sh
2822
- uses: actions/setup-python@v4
2923
with:
3024
python-version: '3.10'
3125
cache: 'pip'
32-
- run: pip install -r requirements.txt
33-
- name: Checks
34-
uses: pre-commit/action@v3.0.0
26+
- name: Install python dependencies
27+
run: pip install -r requirements.txt
28+
- name: Run checkers
29+
run: |
30+
pre-commit run --all
3531
36-
gcc:
37-
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
32+
unit_tests:
33+
runs-on: dds-base
3834
strategy:
35+
# test everything, even if one fails
3936
fail-fast: false
4037
matrix:
4138
include:
4239
- cxx: g++-12
40+
- cxx: g++-11
41+
- cxx: g++-10
42+
- cxx: icpx
4343
name: ${{ matrix.cxx }}
4444
env:
4545
CXX: ${{ matrix.cxx }}
4646
steps:
4747
- uses: actions/checkout@v4
48-
- uses: rscohn2/setup-oneapi@v0
49-
with:
50-
components: |
51-
${{ env.IMPI }}
52-
${{ env.MKL }}
53-
${{ env.TBB }}
5448
- name: Generate
5549
run: |
5650
source /opt/intel/oneapi/setvars.sh
5751
cmake -B build
5852
- name: Build
5953
run: |
6054
source /opt/intel/oneapi/setvars.sh
61-
make -C build -j 2
62-
- name: Test
55+
make -C build -j
56+
- name: MHP unit tests
57+
run: |
58+
source /opt/intel/oneapi/setvars.sh
59+
ctest --test-dir build -L MHP
60+
- name: SHP unit tests
61+
# Does not work on CPU
62+
if: false
6363
run: |
6464
source /opt/intel/oneapi/setvars.sh
65-
ctest --test-dir build
65+
ctest --test-dir build -L SHP
6666
- uses: actions/upload-artifact@v3
6767
if: always()
6868
with:
6969
name: log-gcc-${{ env.CXX }}
7070
path: build/Testing
7171

72-
icpx:
73-
runs-on: devcloud
74-
timeout-minutes: 60
75-
# MPI device memory does not work
76-
env:
77-
CXX: icpx
78-
# MPI complains about a ptrace issue when doing MPI_Win_create on device memory
79-
I_MPI_OFFLOAD_IPC: 0
80-
# and when ptrace is not an issue, these nodes have another problem
81-
# EXCLUDE: "--exclude=idc-beta-batch-pvc-node-17,idc-beta-batch-pvc-node-18,idc-beta-batch-pvc-node-19"
82-
steps:
83-
- uses: actions/checkout@v4
84-
- name: Test
85-
run: srun ${EXCLUDE} -p pvc-shared scripts/devcloud-test.sh
86-
- name: Upload build logs
87-
uses: actions/upload-artifact@v3
88-
if: always()
89-
with:
90-
name: log-icpx
91-
path: build/Testing
92-
9372
publish:
94-
needs: [checks, gcc, icpx]
95-
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
73+
needs: [checks, unit_tests]
74+
runs-on: dds-base
9675
env:
9776
SPHINXOPTS: -q -W
9877
if: ${{ github.ref == 'refs/heads/main' }}

‎CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
4444
add_link_options(--gcc-toolchain=${GCC_TOOLCHAIN})
4545
endif()
4646

47+
if(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
48+
set(ENABLE_SYCL on)
49+
endif()
50+
4751
if(ENABLE_SYCL)
4852
add_compile_options(-fsycl)
4953
add_link_options(-fsycl)
@@ -261,7 +265,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
261265
add_compile_options(-Wno-error=stringop-overflow=)
262266
endif()
263267

264-
# This must be appear after -Wall
268+
# This must appear after -Wall
265269
if(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
266270
# Most code get warnings with -ffast-math
267271
add_compile_options(-Wno-tautological-constant-compare)

‎README.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66
Distributed Ranges
77
====================
88

9-
.. image:: https://github.com/oneapi-src/distributed-ranges/actions/workflows/pr.yml/badge.svg
10-
:target: https://github.com/oneapi-src/distributed-ranges/actions/workflows/pr.yml
11-
12-
.. image:: https://github.com/oneapi-src/distributed-ranges/actions/workflows/devcloud.yml/badge.svg
13-
:target: https://github.com/oneapi-src/distributed-ranges/actions/workflows/devcloud.yml
9+
.. image:: https://github.com/intel-sandbox/libraries.runtimes.hpc.dds.distributed-ranges/actions/workflows/pr.yml/badge.svg
10+
:target: https://github.com/intel-sandbox/libraries.runtimes.hpc.dds.distributed-ranges/actions/workflows/pr.yml
1411

1512
Productivity library for distributed and partitioned memory based on
1613
C++ Ranges.

‎devcloud.rst

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎include/dr/mhp/global.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
#pragma once
66

7+
#include <unistd.h>
8+
79
#include <dr/detail/sycl_utils.hpp>
810
#include <dr/mhp/sycl_support.hpp>
911

0 commit comments

Comments
 (0)
0