From 1da27081470fb7e56f665a5f1ca099b7ddf032cb Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Tue, 21 May 2024 15:02:15 -0500 Subject: [PATCH 01/10] testing for portblas portfft --- .github/workflows/pr.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 072ee836c..f7c475e00 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -19,8 +19,20 @@ jobs: # One runner for each domain strategy: matrix: - domain: [blas, dft, lapack, rng] - name: MKL ${{ matrix.domain }} CPU + include: + - config: portBLAS + options: -DENABLE_PORTBLAS_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=blas + - config: portFFT + options: -DENABLE_PORTFFT_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=dft + - config: MKL BLAS + options: -DTARGET_DOMAINS=blas + - config: MKL DFT + options: -DTARGET_DOMAINS=dft + - config: MKL LAPACK + options: -DTARGET_DOMAINS=lapack + - config: MKL RNG + options: -DTARGET_DOMAINS=rng + name: ${{ matrix.config }} CPU steps: - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Restore netlib from cache @@ -49,10 +61,9 @@ jobs: - name: Configure/Build for a domain run: | source /opt/intel/oneapi/setvars.sh - cmake -DREF_BLAS_ROOT=${PWD}/lapack/install -DREF_LAPACK_ROOT=${PWD}/lapack/install -DENABLE_MKLGPU_BACKEND=off -DTARGET_DOMAINS=${{ matrix.domain }} -DCMAKE_VERBOSE_MAKEFILE=on -B build + cmake -DREF_BLAS_ROOT=${PWD}/lapack/install -DREF_LAPACK_ROOT=${PWD}/lapack/install -DENABLE_MKLGPU_BACKEND=off -DCMAKE_VERBOSE_MAKEFILE=on ${{ matrix.options }} -B build cmake --build build ${PARALLEL} - name: Run tests run: | source /opt/intel/oneapi/setvars.sh - # Run tests, skip GPU tests - ctest --test-dir build -j 1 -E 'ct$' + ctest --test-dir build From 907b23670f64b41f9d3abf747a3a3653af51cba1 Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Tue, 21 May 2024 15:30:09 -0500 Subject: [PATCH 02/10] update --- .github/workflows/pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f7c475e00..d653d9555 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -21,9 +21,9 @@ jobs: matrix: include: - config: portBLAS - options: -DENABLE_PORTBLAS_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=blas + options: -DENABLE_PORTBLAS_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=blas -DCMAKE_CXX_FLAGS="-fsycl -fsycl-targets=spir64" - config: portFFT - options: -DENABLE_PORTFFT_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=dft + options: -DENABLE_PORTFFT_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=dft -DCMAKE_CXX_FLAGS="-fsycl -fsycl-targets=spir64" - config: MKL BLAS options: -DTARGET_DOMAINS=blas - config: MKL DFT From eda138e45db76868fe6fc89bde98e0356d61d1ce Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Wed, 22 May 2024 08:43:30 -0500 Subject: [PATCH 03/10] respond to review comments --- .github/workflows/pr.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d653d9555..df0cf7b4c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -21,17 +21,23 @@ jobs: matrix: include: - config: portBLAS - options: -DENABLE_PORTBLAS_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=blas -DCMAKE_CXX_FLAGS="-fsycl -fsycl-targets=spir64" + options: -DENABLE_PORTBLAS_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=blas + tests: '.*Nrm2Tests.RealSinglePrecision.*' - config: portFFT options: -DENABLE_PORTFFT_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=dft -DCMAKE_CXX_FLAGS="-fsycl -fsycl-targets=spir64" + tests: '.*ComputeTests_in_place_COMPLEX.COMPLEX_SINGLE_in_place_buffer.*' - config: MKL BLAS options: -DTARGET_DOMAINS=blas + tests: '.*' - config: MKL DFT options: -DTARGET_DOMAINS=dft + tests: '.*' - config: MKL LAPACK options: -DTARGET_DOMAINS=lapack + tests: '.*' - config: MKL RNG options: -DTARGET_DOMAINS=rng + tests: '.*' name: ${{ matrix.config }} CPU steps: - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 @@ -66,4 +72,4 @@ jobs: - name: Run tests run: | source /opt/intel/oneapi/setvars.sh - ctest --test-dir build + ctest --test-dir build -R ${{ matrix.tests }} From b2436968f959a2a3cb7c5f25bad41032c2effe85 Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Wed, 22 May 2024 09:25:38 -0500 Subject: [PATCH 04/10] update --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index df0cf7b4c..57837b046 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -25,7 +25,7 @@ jobs: tests: '.*Nrm2Tests.RealSinglePrecision.*' - config: portFFT options: -DENABLE_PORTFFT_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=dft -DCMAKE_CXX_FLAGS="-fsycl -fsycl-targets=spir64" - tests: '.*ComputeTests_in_place_COMPLEX.COMPLEX_SINGLE_in_place_buffer.*' + tests: 'DFT/CT/.*ComputeTests_in_place_COMPLEX.COMPLEX_SINGLE_in_place_buffer.sizes_8_batches_1*' - config: MKL BLAS options: -DTARGET_DOMAINS=blas tests: '.*' From 5c67db8a6452a34884875a7089b9974f453b10f0 Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Thu, 23 May 2024 08:26:26 -0500 Subject: [PATCH 05/10] AOT compile for port* --- .github/workflows/pr.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 57837b046..80feca2f4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -21,11 +21,13 @@ jobs: matrix: include: - config: portBLAS - options: -DENABLE_PORTBLAS_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=blas - tests: '.*Nrm2Tests.RealSinglePrecision.*' + options: -DENABLE_PORTBLAS_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=blas -DPORTBLAS_TUNING_TARGET=INTEL_CPU + # tests: '.*Nrm2Tests.RealSinglePrecision.*' + tests: '.*' - config: portFFT - options: -DENABLE_PORTFFT_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=dft -DCMAKE_CXX_FLAGS="-fsycl -fsycl-targets=spir64" - tests: 'DFT/CT/.*ComputeTests_in_place_COMPLEX.COMPLEX_SINGLE_in_place_buffer.sizes_8_batches_1*' + options: -DENABLE_PORTFFT_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=dft -DCMAKE_CXX_FLAGS="-fsycl -fsycl-targets=spir64_x86_64" + # tests: 'DFT/CT/.*ComputeTests_in_place_COMPLEX.COMPLEX_SINGLE_in_place_buffer.sizes_8_batches_1*' + tests: '.*' - config: MKL BLAS options: -DTARGET_DOMAINS=blas tests: '.*' From e51c68ab8cff4641cf064933b40f2e1b452c4041 Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Thu, 23 May 2024 11:53:31 -0500 Subject: [PATCH 06/10] portfft tests do not run --- .github/workflows/pr.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 80feca2f4..4136335d6 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -26,8 +26,7 @@ jobs: tests: '.*' - config: portFFT options: -DENABLE_PORTFFT_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=dft -DCMAKE_CXX_FLAGS="-fsycl -fsycl-targets=spir64_x86_64" - # tests: 'DFT/CT/.*ComputeTests_in_place_COMPLEX.COMPLEX_SINGLE_in_place_buffer.sizes_8_batches_1*' - tests: '.*' + tests: 'DFT/CT/.*ComputeTests_in_place_COMPLEX.COMPLEX_SINGLE_in_place_buffer.sizes_8_batches_1*' - config: MKL BLAS options: -DTARGET_DOMAINS=blas tests: '.*' From 85ed214c5525f05be3660cbc9e327e7d719f1dd0 Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Fri, 24 May 2024 07:23:56 -0500 Subject: [PATCH 07/10] portfft is spir64 --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 4136335d6..e97b43d7e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -25,7 +25,7 @@ jobs: # tests: '.*Nrm2Tests.RealSinglePrecision.*' tests: '.*' - config: portFFT - options: -DENABLE_PORTFFT_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=dft -DCMAKE_CXX_FLAGS="-fsycl -fsycl-targets=spir64_x86_64" + options: -DENABLE_PORTFFT_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=dft -DCMAKE_CXX_FLAGS="-fsycl -fsycl-targets=spir64" tests: 'DFT/CT/.*ComputeTests_in_place_COMPLEX.COMPLEX_SINGLE_in_place_buffer.sizes_8_batches_1*' - config: MKL BLAS options: -DTARGET_DOMAINS=blas From d1a46b0e96304f2b840ff4ab2c0cfa14262b364d Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Fri, 24 May 2024 07:26:34 -0500 Subject: [PATCH 08/10] use ubuntu-latest runners --- .github/workflows/pr.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e97b43d7e..5d2463fe8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,8 +14,8 @@ env: PARALLEL: -j 2 jobs: - mkl: - runs-on: intel-ubuntu-latest + unit-tests: + runs-on: ubuntu-latest # One runner for each domain strategy: matrix: @@ -39,7 +39,7 @@ jobs: - config: MKL RNG options: -DTARGET_DOMAINS=rng tests: '.*' - name: ${{ matrix.config }} CPU + name: unit tests ${{ matrix.config }} CPU steps: - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Restore netlib from cache From 634ade97d820324ecbf61eebd93001deca1f7618 Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Mon, 27 May 2024 08:37:01 -0400 Subject: [PATCH 09/10] remove commented out code Co-authored-by: Romain Biessy --- .github/workflows/pr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 5d2463fe8..0c0cb4405 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -22,7 +22,6 @@ jobs: include: - config: portBLAS options: -DENABLE_PORTBLAS_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=blas -DPORTBLAS_TUNING_TARGET=INTEL_CPU - # tests: '.*Nrm2Tests.RealSinglePrecision.*' tests: '.*' - config: portFFT options: -DENABLE_PORTFFT_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=dft -DCMAKE_CXX_FLAGS="-fsycl -fsycl-targets=spir64" From 69ac4b1069e75cd729711f66152ccb35f4790c5e Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Wed, 29 May 2024 16:35:50 -0500 Subject: [PATCH 10/10] review comment suggestions --- .github/workflows/pr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0c0cb4405..7c22d384f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -21,19 +21,19 @@ jobs: matrix: include: - config: portBLAS - options: -DENABLE_PORTBLAS_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=blas -DPORTBLAS_TUNING_TARGET=INTEL_CPU + options: -DTARGET_DOMAINS=blas -DREF_BLAS_ROOT=${PWD}/lapack/install -DENABLE_PORTBLAS_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DPORTBLAS_TUNING_TARGET=INTEL_CPU tests: '.*' - config: portFFT options: -DENABLE_PORTFFT_BACKEND=ON -DENABLE_MKLCPU_BACKEND=OFF -DTARGET_DOMAINS=dft -DCMAKE_CXX_FLAGS="-fsycl -fsycl-targets=spir64" tests: 'DFT/CT/.*ComputeTests_in_place_COMPLEX.COMPLEX_SINGLE_in_place_buffer.sizes_8_batches_1*' - config: MKL BLAS - options: -DTARGET_DOMAINS=blas + options: -DTARGET_DOMAINS=blas -DREF_BLAS_ROOT=${PWD}/lapack/install tests: '.*' - config: MKL DFT options: -DTARGET_DOMAINS=dft tests: '.*' - config: MKL LAPACK - options: -DTARGET_DOMAINS=lapack + options: -DTARGET_DOMAINS=lapack -DREF_LAPACK_ROOT=${PWD}/lapack/install tests: '.*' - config: MKL RNG options: -DTARGET_DOMAINS=rng @@ -67,7 +67,7 @@ jobs: - name: Configure/Build for a domain run: | source /opt/intel/oneapi/setvars.sh - cmake -DREF_BLAS_ROOT=${PWD}/lapack/install -DREF_LAPACK_ROOT=${PWD}/lapack/install -DENABLE_MKLGPU_BACKEND=off -DCMAKE_VERBOSE_MAKEFILE=on ${{ matrix.options }} -B build + cmake -DENABLE_MKLGPU_BACKEND=off -DCMAKE_VERBOSE_MAKEFILE=on ${{ matrix.options }} -B build cmake --build build ${PARALLEL} - name: Run tests run: |