Skip to content

Commit b9dfea9

Browse files
WIP
1 parent 3706610 commit b9dfea9

File tree

4 files changed

+4
-42
lines changed

4 files changed

+4
-42
lines changed

.github/workflows/conda-package.yml

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -217,34 +217,18 @@ jobs:
217217
. $CONDA/etc/profile.d/conda.sh
218218
conda activate ${{ env.TEST_ENV_NAME }}
219219
gdb --batch -ex r -ex 'info sharedlibrary' -ex 'set print elements 1000' -ex bt --args ${CONDA_PREFIX}/bin/python -m pytest -q -ra --disable-warnings --pyargs dpctl.tests.elementwise.test_trigonometric::test_trig_order -vv || true
220-
- uses: actions/[email protected]
221-
with:
222-
fetch-depth: 0
223-
- name: Location of working directory
224-
working-directory: ${{ github.workspace }}
225-
run: pwd
226-
- name: List directory of checkout
227-
working-directory: ${{ github.workspace }}
228-
run: ls -l dpctl
229220
- name: Create test temp dir
230221
# create temporary empty folder to runs tests from
231222
# https://github.com/pytest-dev/pytest/issues/11904
232223
run: mkdir -p ${GITHUB_WORKSPACE}/test_tmp
233-
- name: Create symbolic link to checked-out tests folder
234-
run: ln -s ${GITHUB_WORKSPACE}/dpctl/tests/ ${GITHUB_WORKSPACE}/test_tmp/dpctl_tests
235-
- name: List content of symbolic directory
236-
run: ls -l ${GITHUB_WORKSPACE}/test_tmp/dpctl_tests
237-
- name: List directory of temp_tmp
238-
working-directory: ${{ github.workspace }}/test_tmp
239-
run: ls -l
240224
- name: Run tests
241225
working-directory: ${{ github.workspace }}/test_tmp
242226
env:
243227
SYCL_CACHE_PERSISTENT: 1
244228
run: |
245229
. $CONDA/etc/profile.d/conda.sh
246230
conda activate ${{ env.TEST_ENV_NAME }}
247-
python -m pytest -v --skip-known-top-k-failures-on-cpu dpctl_tests
231+
python -m pytest -v --pyargs $MODULE_NAME
248232
249233
test_windows:
250234
needs: build_windows
@@ -398,37 +382,24 @@ jobs:
398382
run: >-
399383
conda activate ${{ env.TEST_ENV_NAME }} && python -m dpctl -f
400384
401-
- uses: actions/[email protected]
402-
with:
403-
fetch-depth: 0
404-
405385
- name: Create empty temporary directory to run tests from
406386
shell: cmd /C CALL {0}
407387
# create temporary empty folder to runs tests from
408388
# https://github.com/pytest-dev/pytest/issues/11904
409389
run: >-
410-
mkdir "${{ env.workdir }}\test_tmp" && mkdir "${{ env.workdir }}\test_tmp\dpctl_tests"
411-
412-
- name: Copy tests from checkout
413-
shell: cmd /C CALL {0}
414-
run: >-
415-
xcopy /S /E "${{ env.workdir }}\dpctl\tests" "${{ env.workdir }}\test_tmp\dpctl_tests"
390+
mkdir "${{ env.workdir }}\test_tmp"
416391
417392
- name: List content of workdir folder
418393
shell: cmd /C CALL {0}
419394
run: dir "${{ env.workdir }}"
420395

421-
- name: List content of test_tmp folder
422-
shell: cmd /C CALL {0}
423-
run: dir "${{ env.workdir }}\test_tmp"
424-
425396
- name: Run tests
426397
shell: cmd /C CALL {0}
427398
env:
428399
SYCL_CACHE_PERSISTENT: 1
429400
working-directory: ${{ env.workdir }}\test_tmp
430401
run: >-
431-
conda activate ${{ env.TEST_ENV_NAME }} && python -m pytest -v -s --skip-known-top-k-failures-on-cpu dpctl_tests
402+
conda activate ${{ env.TEST_ENV_NAME }} && python -m pytest -v -s --pyargs ${{ env.MODULE_NAME }}
432403
433404
upload_linux:
434405
needs: test_linux

dpctl/tests/conftest.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,6 @@ def pytest_addoption(parser):
6262
default=False,
6363
help="skip test_syclinterface",
6464
)
65-
parser.addoption(
66-
"--skip-known-top-k-failures-on-cpu",
67-
action="store_true",
68-
default=False,
69-
help="skip top_k tests for types int8/int16 known to "
70-
"fail on CPU devices on older architectures with "
71-
"DPC++ 2025.0",
72-
)
7365

7466

7567
def pytest_collection_modifyitems(config, items):

dpctl/tests/test_usm_ndarray_top_k.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
@pytest.fixture
2424
def skip_known_failues_on_cpu(request):
25-
return request.config.getoption("--skip-known-top-k-failures-on-cpu")
25+
return False
2626

2727

2828
def _expected_largest_inds(inp, n, shift, k):

scripts/gen_coverage.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ def run(
102102
"dpctl",
103103
"-vv",
104104
"--ignore=dpctl/tensor/libtensor/tests",
105-
"--skip-known-top-k-failures-on-cpu",
106105
"--no-sycl-interface-test",
107106
],
108107
cwd=setup_dir,

0 commit comments

Comments
 (0)