Kaynağa Gözat

Moved scattnlay.pyx to src directory.

Ovidio Peña Rodríguez 7 yıl önce
ebeveyn
işleme
091a523e47
4 değiştirilmiş dosya ile 9 ekleme ve 9 silme
  1. 5 5
      Makefile
  2. 2 2
      src/scattnlay.cpp
  3. 0 0
      src/scattnlay.pyx
  4. 2 2
      src/scattnlay_mp.cpp

+ 5 - 5
Makefile

@@ -22,13 +22,13 @@ all:
 source:
 	$(PYTHON) setup.py sdist $(COMPILE) --dist-dir=../
 
-cython: scattnlay.pyx
+cython: $(SRCDIR)/scattnlay.pyx
     # create c++ code for double precision module
-	$(CYTHON) --cplus scattnlay.pyx -o $(SRCDIR)/scattnlay.cpp
+	$(CYTHON) --cplus $(SRCDIR)/scattnlay.pyx -o $(SRCDIR)/scattnlay.cpp
 	# create c++ code for MP module
-	ln -s scattnlay.pyx scattnlay_mp.pyx
-	$(CYTHON) --cplus scattnlay_mp.pyx -o $(SRCDIR)/scattnlay_mp.cpp
-	rm scattnlay_mp.pyx
+	ln -s $(SRCDIR)/scattnlay.pyx $(SRCDIR)/scattnlay_mp.pyx
+	$(CYTHON) --cplus $(SRCDIR)/scattnlay_mp.pyx -o $(SRCDIR)/scattnlay_mp.cpp
+	rm $(SRCDIR)/scattnlay_mp.pyx
 
 python_ext: $(SRCDIR)/nmie.cc $(SRCDIR)/py_nmie.cc $(SRCDIR)/scattnlay.cpp $(SRCDIR)/scattnlay_mp.cpp
 	$(PYTHON) setup.py build_ext --inplace

+ 2 - 2
src/scattnlay.cpp

@@ -485,7 +485,7 @@ static const char *__pyx_filename;
 
 
 static const char *__pyx_f[] = {
-  "scattnlay.pyx",
+  "src/scattnlay.pyx",
   "__init__.pxd",
   "stringsource",
   "type.pxd",
@@ -1261,7 +1261,7 @@ static char __pyx_k_scattcoeffs[] = "scattcoeffs";
 static char __pyx_k_C_CONTIGUOUS[] = "C_CONTIGUOUS";
 static char __pyx_k_RuntimeError[] = "RuntimeError";
 static char __pyx_k_ndarray_is_not_C_contiguous[] = "ndarray is not C contiguous";
-static char __pyx_k_home_ovidio_scattering_scattnla[] = "/home/ovidio/scattering/scattnlay/python-scattnlay-2.1/scattnlay.pyx";
+static char __pyx_k_home_ovidio_scattering_scattnla[] = "/home/ovidio/scattering/scattnlay/python-scattnlay-2.1/src/scattnlay.pyx";
 static char __pyx_k_unknown_dtype_code_in_numpy_pxd[] = "unknown dtype code in numpy.pxd (%d)";
 static char __pyx_k_Format_string_allocated_too_shor[] = "Format string allocated too short, see comment in numpy.pxd";
 static char __pyx_k_Non_native_byte_order_not_suppor[] = "Non-native byte order not supported";

+ 0 - 0
scattnlay.pyx → src/scattnlay.pyx


+ 2 - 2
src/scattnlay_mp.cpp

@@ -485,7 +485,7 @@ static const char *__pyx_filename;
 
 
 static const char *__pyx_f[] = {
-  "scattnlay_mp.pyx",
+  "src/scattnlay_mp.pyx",
   "__init__.pxd",
   "stringsource",
   "type.pxd",
@@ -1262,7 +1262,7 @@ static char __pyx_k_C_CONTIGUOUS[] = "C_CONTIGUOUS";
 static char __pyx_k_RuntimeError[] = "RuntimeError";
 static char __pyx_k_scattnlay_mp[] = "scattnlay_mp";
 static char __pyx_k_ndarray_is_not_C_contiguous[] = "ndarray is not C contiguous";
-static char __pyx_k_home_ovidio_scattering_scattnla[] = "/home/ovidio/scattering/scattnlay/python-scattnlay-2.1/scattnlay_mp.pyx";
+static char __pyx_k_home_ovidio_scattering_scattnla[] = "/home/ovidio/scattering/scattnlay/python-scattnlay-2.1/src/scattnlay_mp.pyx";
 static char __pyx_k_unknown_dtype_code_in_numpy_pxd[] = "unknown dtype code in numpy.pxd (%d)";
 static char __pyx_k_Format_string_allocated_too_shor[] = "Format string allocated too short, see comment in numpy.pxd";
 static char __pyx_k_Non_native_byte_order_not_suppor[] = "Non-native byte order not supported";