Fix Cython extra compile args

metgem · Aug 7, 2023 · 08a8034 · 08a8034
1 parent 5aef7cd
commit 08a8034
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -51,16 +51,11 @@ jobs:
       shell: bash -e {0}
       run: python -m pip install pytest-xvfb
       if: runner.os == 'Linux'
-    - name: Test imports
-      shell: bash -e {0}
-      run: |
-        python -c "import libmetgem"
-        python -c "from libmetgem import IS_CYTHONIZED; assert IS_CYTHONIZED == True"
-        python -c "from libmetgem.cosine import cosine_score; print(cosine_score)"
-        python -c "import libmetgem._cosine"
     - name: Test with pytest
       shell: bash -e {0}
-      run: pytest --cov=libmetgem --cov-report=xml -s -x
+      run: |
+        cd tests
+        pytest --cov=libmetgem --cov-report=xml
     - name: Upload coverage
       if: success()
       uses: codecov/codecov-action@v1

diff --git a/setup.py b/setup.py
@@ -40,8 +40,8 @@
             Extension(
                 "libmetgem._cosine",
                 [os.path.join(SRC_PATH, "_cosine.pyx")],
-                extra_compile_args=[OPENMP_FLAGS],
-                extra_link_args=[OPENMP_FLAGS]
+                extra_compile_args=OPENMP_FLAGS.split(),
+                extra_link_args=OPENMP_FLAGS.split()
             ),
             Extension(
                 "libmetgem._filter",
@@ -68,8 +68,8 @@
             Extension(
                 "libmetgem._neighbors",
                 [os.path.join(SRC_PATH, "_neighbors.pyx")],
-                extra_compile_args=[OPENMP_FLAGS, "-std=c++11"],
-                extra_link_args=[OPENMP_FLAGS]
+                extra_compile_args=[*OPENMP_FLAGS.split(), "-std=c++11"],
+                extra_link_args=OPENMP_FLAGS.split()
             )
         ]