Browse Source

Making proper setup ...

shkolnick-kun 3 years ago
parent
commit
a752a5ad90

+ 1 - 1
.gitignore

@@ -1,6 +1,6 @@
 # Setup tools outputs #
 #######################
-src/yaflpy.c
+src/yaflpy/yaflpy.c
 *.egg-*
 
 # Compiled Object files #

+ 1 - 1
MANIFEST.in

@@ -1 +1 @@
-include src/* src/configpy/* LICENSE Readme.md
+include src/* src/yaflpy/* LICENSE Readme.md

+ 5 - 2
setup.py

@@ -5,12 +5,15 @@ from setuptools import Extension, setup
 from Cython.Build import cythonize #must be after setuptools
 
 #------------------------------------------------------------------------------
+EXT_NAME = 'yaflpy'
+
 setup_dir = dirname(__file__)
 src_dir   = join(setup_dir, 'src')
+ext_dir   = join(src_dir, EXT_NAME)
 
 extensions = [
-    Extension('yaflpy', [join(src_dir, 'yaflpy.pyx')],
-        include_dirs=[numpy.get_include(), src_dir, join(src_dir, 'configpy')],
+    Extension(EXT_NAME, [join(ext_dir, EXT_NAME + '.pyx')],
+        include_dirs=[numpy.get_include(), src_dir, ext_dir],
         define_macros=[("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")])
     ]
 

+ 2 - 0
src/yaflpy/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+

+ 0 - 0
src/configpy/yafl_config.h → src/yaflpy/yafl_config.h


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


+ 2 - 2
tests/projects/hdf5_test.cbp

@@ -26,7 +26,7 @@
 			<Add option="-g" />
 			<Add directory="../src" />
 			<Add directory="../../src" />
-			<Add directory="../../src/configpy" />
+			<Add directory="../../src/yaflpy" />
 		</Compiler>
 		<Linker>
 			<Add library="/usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5.a" />
@@ -37,7 +37,6 @@
 			<Add library="m" />
 			<Add directory="/home/anon/Documents/Projects/hdf5_test/" />
 		</Linker>
-		<Unit filename="../../src/configpy/yafl_config.h" />
 		<Unit filename="../../src/yafl.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -46,6 +45,7 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../../src/yafl_math.h" />
+		<Unit filename="../../src/yaflpy/yafl_config.h" />
 		<Unit filename="../src/hdf5utils.c">
 			<Option compilerVar="CC" />
 		</Unit>

+ 2 - 2
tests/src/yaflpy_compile.py

@@ -22,7 +22,7 @@ import scipy.stats
 import sys
 import time
 
-sys.path.insert(0,'../../src')
+sys.path.insert(0,'../../src/yaflpy')
 
 pyximport.install(
     build_dir='../projects/obj',
@@ -30,7 +30,7 @@ pyximport.install(
     reload_support=True,
     language_level=3,
     setup_args={
-        'include_dirs': [np.get_include(), '../../src', '../../src/configpy'],
+        'include_dirs': [np.get_include(), '../../src', '../../src/yaflpy'],
         }
     )
 

+ 3 - 3
tests/src/yaflpy_compile_robust.py

@@ -22,7 +22,7 @@ import scipy.stats
 import sys
 import time
 
-sys.path.insert(0,'../../src')
+sys.path.insert(0,'../../src/yaflpy')
 
 pyximport.install(
     build_dir='../projects/obj',
@@ -30,9 +30,9 @@ pyximport.install(
     reload_support=True,
     language_level=3,
     setup_args={
-        'include_dirs': [np.get_include(), '../../src', '../../src/configpy'],
+        'include_dirs': [np.get_include(), '../../src', '../../src/yaflpy'],
         }
-    )
+    ))
 
 import yaflpy
 

+ 2 - 2
tests/src/yaflpy_compile_unscented.py

@@ -22,7 +22,7 @@ import scipy.stats
 import sys
 import time
 
-sys.path.insert(0,'../../src')
+sys.path.insert(0,'../../src/yaflpy')
 
 pyximport.install(
     build_dir='../projects/obj',
@@ -30,7 +30,7 @@ pyximport.install(
     reload_support=True,
     language_level=3,
     setup_args={
-        'include_dirs': [np.get_include(), '../../src', '../../src/configpy'],
+        'include_dirs': [np.get_include(), '../../src', '../../src/yaflpy'],
         }
     )
 

+ 2 - 2
tests/src/yaflpy_compile_unscented_robust.py

@@ -22,7 +22,7 @@ import scipy.stats
 import sys
 import time
 
-sys.path.insert(0,'../../src')
+sys.path.insert(0,'../../src/yaflpy')
 
 pyximport.install(
     build_dir='../projects/obj',
@@ -30,7 +30,7 @@ pyximport.install(
     reload_support=True,
     language_level=3,
     setup_args={
-        'include_dirs': [np.get_include(), '../../src', '../../src/configpy'],
+        'include_dirs': [np.get_include(), '../../src', '../../src/yaflpy'],
         }
     )