Skip to content

Commit 24003ad

Browse files
committed
debug: revert cmake, change import smoke test
1 parent 28d9bf8 commit 24003ad

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.github/workflows/build-with-clang.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
- name: Smoke import
7474
run: |
7575
source ${{ env.ONEAPI_ROOT }}/setvars.sh
76+
cd ..
7677
python -X faulthandler -c "import numpy, mkl_umath; print('import OK')"
7778
7879
- name: Run mkl_umath tests

CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ install(TARGETS ${_trgt}
125125
)
126126

127127
python_add_library(_ufuncs MODULE WITH_SOABI "mkl_umath/src/ufuncsmodule.c" "mkl_umath/src/__umath_generated.c")
128-
# Ensure output name is _ufuncs (default ok) and install both targets
129-
set_target_properties(_ufuncs PROPERTIES C_STANDARD 99)
130128
target_include_directories(_ufuncs PRIVATE "mkl_umath/src" ${Python_NumPy_INCLUDE_DIRS} ${MKL_INCLUDE_DIR})
131129
target_compile_definitions(_ufuncs PUBLIC NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION)
132130
target_link_options(_ufuncs PRIVATE ${_linker_options})
@@ -135,8 +133,7 @@ set_target_properties(_ufuncs PROPERTIES C_STANDARD 99)
135133
if (UNIX)
136134
set_target_properties(_ufuncs PROPERTIES INSTALL_RPATH "$ORIGIN/../..;$ORIGIN/../../..;$ORIGIN")
137135
endif()
138-
install(TARGETS ${_trgt} DESTINATION mkl_umath)
139-
install(TARGETS _ufuncs DESTINATION mkl_umath)
136+
install(TARGETS _ufuncs LIBRARY DESTINATION mkl_umath)
140137

141138
add_cython_target(_patch "mkl_umath/src/_patch.pyx" C OUTPUT_VAR _generated_src)
142139
Python_add_library(_patch MODULE WITH_SOABI ${_generated_src})

0 commit comments

Comments
 (0)