Merge branch 'master' into oscar_scale

CEA-COSMIC · Mar 12, 2021 · ada55a8 · ada55a8
2 parents f790170 + 384e007
commit ada55a8
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 160 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,6 +9,7 @@ jobs:
     docker:
       - image: circleci/python:3.6
     working_directory: ~/repo
+    parallelism: 4
     steps:
       - checkout
       - restore_cache:
@@ -43,7 +44,9 @@ jobs:
             pip install --upgrade pip
             pip install Cython
             pip install -e .
-            python .circleci/test_script.py
+            TESTFILES=$(circleci tests glob examples/*.py | circleci tests split --split-by=timings)
+            echo ${TESTFILES}
+            python3 -m unittest ${TESTFILES}
       - store_artifacts:
           path: test-reports
           destination: test-reports
diff --git a/.circleci/test_script.py b/.circleci/test_script.py
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ language: python
 cache: pip
 matrix:
     include:
-        - python: 3.5
         - python: 3.6
         - python: 3.7
         - python: 3.8

diff --git a/examples/non_cartesian_reconstruction_stack_3d.py b/examples/non_cartesian_reconstruction_stack_3d.py
diff --git a/mri/operators/fourier/cartesian.py b/mri/operators/fourier/cartesian.py
@@ -21,20 +21,6 @@
 from .utils import convert_locations_to_mask, convert_mask_to_locations
 from modopt.interface.errors import warn
 
-# Third party import
-try:
-    import pynfft
-except Exception:
-    warnings.warn("pynfft python package has not been found. If needed use "
-                  "the master release.")
-    pass
-try:
-    from pynufft import NUFFT_hsa, NUFFT_cpu
-except Exception:
-    warnings.warn("pynufft python package has not been found. If needed use "
-                  "the master release. Till then you cannot use NUFFT on GPU")
-    pass
-
 
 class FFT(OperatorBase):
     """ Standard unitary ND Fast Fourrier Transform class.