Crap work on crap branch.

ratt-ru · Oct 23, 2017 · b6879a6 · b6879a6 · o-smirnov · May 22, 2018
1 parent 3063f70
commit b6879a6
Show file tree

Hide file tree

Showing 16 changed files with 52,213 additions and 4,264 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,3 @@
 include cubical/DefaultParset.cfg
 recursive-include cython *
+include cubical/bin/gocubical
diff --git a/cubical/kernels/cychain.c b/cubical/kernels/cychain.c
diff --git a/cubical/kernels/cychain.pyx b/cubical/kernels/cychain.pyx
@@ -28,7 +28,6 @@ provided. Common dimensions of arrays are:
 
 """
 
-from cython.parallel import prange, parallel
 import numpy as np
 cimport numpy as np
 import cython

diff --git a/cubical/kernels/cyf_slope.cpp b/cubical/kernels/cyf_slope.cpp
diff --git a/cubical/kernels/cyf_slope.pyx b/cubical/kernels/cyf_slope.pyx
@@ -30,7 +30,6 @@ provided. Common dimensions of arrays are:
 
 """
 
-from cython.parallel import prange, parallel
 import numpy as np
 cimport numpy as np
 import cython

diff --git a/cubical/kernels/cyfull_W_complex.c b/cubical/kernels/cyfull_W_complex.c
diff --git a/cubical/kernels/cyfull_W_complex.pyx b/cubical/kernels/cyfull_W_complex.pyx
@@ -2,7 +2,6 @@
 # (c) 2017 Rhodes University & Jonathan S. Kenyon
 # http://github.com/ratt-ru/CubiCal
 # This code is distributed under the terms of GPLv2, see LICENSE.md for details
-from cython.parallel import prange, parallel
 import numpy as np
 cimport numpy as np
 import cython

diff --git a/cubical/kernels/cyfull_complex.c b/cubical/kernels/cyfull_complex.c
diff --git a/cubical/kernels/cyfull_complex.pyx b/cubical/kernels/cyfull_complex.pyx
@@ -28,7 +28,6 @@ provided. Common dimensions of arrays are:
 
 """
 
-from cython.parallel import prange, parallel
 import numpy as np
 cimport numpy as np
 import cython

diff --git a/cubical/kernels/cyphase_only.c b/cubical/kernels/cyphase_only.c
diff --git a/cubical/kernels/cyphase_only.pyx b/cubical/kernels/cyphase_only.pyx
@@ -28,7 +28,6 @@ provided. Common dimensions of arrays are:
 
 """
 
-from cython.parallel import prange, parallel
 import numpy as np
 cimport numpy as np
 import cython

diff --git a/cubical/kernels/cyt_slope.cpp b/cubical/kernels/cyt_slope.cpp
diff --git a/cubical/kernels/cyt_slope.pyx b/cubical/kernels/cyt_slope.pyx
@@ -30,7 +30,6 @@ provided. Common dimensions of arrays are:
 
 """
 
-from cython.parallel import prange, parallel
 import numpy as np
 cimport numpy as np
 import cython