break down interface into modules

knodlseder
1 parent 39ec93c0
Showing 2 changed files with 121 additions and 83 deletions
pyext/Makefile.am
pyext/setup.py.in
@@ -5,38 +5,43 @@
 if WITH_PYTHON
-# Set SWIG interface filename
-SWIG_INTERFACE = gammalib.i
-
-# Define the targets that should be built before anything else.
-# These are honored by 'make all', 'make check' and 'make install'.
-if HAVE_SWIG
-  BUILT_SOURCES = gammalib_wrap.cpp gammalib.py
-endif
-
-# Set files to be removed in clean
-if HAVE_SWIG
-  CLEANFILES = gammalib_wrap.cpp gammalib.py
-endif
-
-# Set extra files to distribute
-#EXTRA_DIST = runme.py
-
-# Set instrument specific SWIG options (those will be catched in gammalib.i)
+# Set instrument specific SWIG targets
 if WITH_INST_MWL
-  OPT_MWL = -DWITH_INST_MWL
-  INC_MWL = -I$(top_srcdir)/inst/mwl/pyext
+  MWL_SWIG_TARGETS = $(top_srcdir)/inst/mwl/pyext/mwl_wrap.cpp \
+					 $(top_srcdir)/inst/mwl/pyext/mwl.py
 endif
 if WITH_INST_CTA
-  OPT_CTA = -DWITH_INST_CTA
-  INC_CTA = -I$(top_srcdir)/inst/cta/pyext
+  CTA_SWIG_TARGETS = $(top_srcdir)/inst/cta/pyext/cta_wrap.cpp \
+					 $(top_srcdir)/inst/cta/pyext/cta.py
 endif
 if WITH_INST_LAT
-  OPT_LAT = -DWITH_INST_LAT
-  INC_LAT = -I$(top_srcdir)/inst/lat/pyext
+  LAT_SWIG_TARGETS = $(top_srcdir)/inst/lat/pyext/lat_wrap.cpp \
+					 $(top_srcdir)/inst/lat/pyext/lat.py
+endif
+INST_SWIG_TARGETS = $(MWL_SWIG_TARGETS) $(CTA_SWIG_TARGETS) $(LAT_SWIG_TARGETS)
+
+# Sources that are required for the build. All targets in the list will be built
+# before anything. These are honored by 'make all', 'make check' and 'make install'.
+# We use this here to make sure that all these targets are build by swig before we
+# start compiling the Python modules.
+BUILT_SOURCES = gammalib/app_wrap.cpp  gammalib/app.py \
+                gammalib/fits_wrap.cpp gammalib/fits.py \
+                gammalib/linalg_wrap.cpp gammalib/linalg.py \
+                gammalib/model_wrap.cpp gammalib/model.py \
+                gammalib/numerics_wrap.cpp gammalib/numerics.py \
+                gammalib/obs_wrap.cpp gammalib/obs.py \
+                gammalib/opt_wrap.cpp gammalib/opt.py \
+                gammalib/sky_wrap.cpp gammalib/sky.py \
+                gammalib/support_wrap.cpp gammalib/support.py \
+                gammalib/xml_wrap.cpp gammalib/xml.py \
+                $(INST_SWIG_TARGETS)
+
+# Set files to be removed in clean. We remove only the SWIG interface files if swig
+# is available to rebuild them. 
+if HAVE_SWIG
+  CLEAN_FILES = $(BUILT_SOURCES)
 endif
-INC_INST = $(INC_MWL) $(INC_CTA) $(INC_LAT)
-OPT_INST = $(OPT_MWL) $(OPT_CTA) $(OPT_LAT)
+CLEANFILES = $(CLEAN_FILES)
 all-local: build
@@ -45,19 +50,23 @@ all-local: build
 # of this specific directory. So we build one instance for checking, the other
 # for installation. If we could get the name built by distutils we could avoid
 # this.
-build: gammalib_wrap.cpp gammalib.py
-	$(PYTHON_BUILD_PREFIX) $(PYTHON) setup.py build --build-platlib build
-	$(PYTHON_BUILD_PREFIX) $(PYTHON) setup.py build
+#$(PYTHON_BUILD_PREFIX) $(PYTHON) setup.py build_ext --build-platlib build
+build: $(BUILT_SOURCES)
+	$(PYTHON_BUILD_PREFIX) $(PYTHON) setup.py build_ext
+
+# make check installs the gammalib extension for checking in the install directory
+check-local:
+	$(PYTHON) setup.py install --home=install
 install-exec-local:
 	$(PYTHON) setup.py install --prefix=$(prefix)
 clean-local:
-	rm -rf build
+	rm -rf build install
 if HAVE_SWIG
-gammalib_wrap.cpp gammalib.py: $(SWIG_INTERFACE)
-	$(SWIG) -c++ -python -Wall -I$(top_srcdir)/src $(INC_INST) $(OPT_INST) -o gammalib_wrap.cpp -outdir . $(srcdir)/$(SWIG_INTERFACE)
+%_wrap.cpp %.py: %.i
+	$(SWIG) -c++ -python -Wall -o $@ -outdir gammalib $<
 endif # HAVE_SWIG
 endif # WITH_PYTHON
@@ -4,41 +4,27 @@ import glob
 import os
 import sys
-# Removes list of bad prefixes from list
-def remove_prefixes(optlist, bad_prefixes):
-	for bad_prefix in bad_prefixes:
-		for i, flag in enumerate(optlist):
-			if flag.startswith(bad_prefix):
-				optlist.pop(i)
-				break
-	return optlist
-
-# Adjust compile options for darwin
-#if sys.platform.lower().startswith("darwin"):
-#
-#	# Remove some time consuming options
-#	cvars = sysconfig.get_config_vars()
-#	cflags = cvars.get('OPT')
-#	if cflags:
-#		cflags = remove_prefixes(cflags.split(), 
-#		         ['-g', '-O', '-Wstrict-prototypes', '-DNDEBUG'])
-#	cvars['OPT'] = str.join(' ', cflags)
-#	cvars['CFLAGS'] = cvars['BASECFLAGS'] + ' ' + cvars['OPT']
-#	
-#	# Remove -arch flags. This prevents building a fat library
-#	cvars['ARCHFLAGS'] = ''
-#	
-#	# Signal darwin compiler adjustments
-#	print 'Adjust default distutils compiler options for darwin.'
+# Define package name
+pkg_name = 'gammalib'
+
+# Define core modules
+core_modules = ['app', 'fits', 'linalg', 'model', 'numerics', \
+                'obs', 'opt', 'sky', 'support', 'xml']
+
+# Check on test install
+if (len(sys.argv) == 3):
+	if (sys.argv[2] == '--home=install'):
+		print "This install is for unit testing."
+
 # Set GammaLib library name. If we're about to make the test build then
 # create a symbolic link to the static library to enforce static linking.
 # This is required on some system (such as Mac OS X) to avoid problems
 # with finding the shared library during unit testing.
 libgamma='gamma'
-if (len(sys.argv) > 3):
-	if (sys.argv[3] == 'build'):
-		
+if (len(sys.argv) > 1):
+	if (1 == 1):
+	
 		# Remove any existing symbolic link to libgamma.a. This will
 		# prevent any exception in creating the symbolic link due to
 		# an already existing link.
@@ -58,16 +44,17 @@ if (len(sys.argv) &gt; 3):
 			print 'WARNING: Failed to create symbolic link to static library. Link dynamically.'
 # Set default include directories and data files
-include_dirs  = ['@top_srcdir@/include']
-data_files    = glob.glob('@top_srcdir@/pyext/*.i')
-library_dirs  = ['../src/.libs']
-libraries     = [libgamma]
+include_dirs = ['@top_srcdir@/include']
+data_files   = glob.glob('@top_srcdir@/pyext/*.i')
+library_dirs = ['../src/.libs']
+libraries    = [libgamma]
 # Set default runtime library directories
 if os.path.exists('@prefix@/lib'):
 	runtime_library_dirs = ['@prefix@/lib']
 else:
 	runtime_library_dirs = []
+runtime_library_dirs = []
 # Add cfitsio library only if available
 if '@WITH_CFITSIO_TRUE@' != '#':
@@ -89,7 +76,7 @@ for extra_lib in extra_libs:
 # Get extra library paths
 extra_lib_paths = ('@LDFLAGS@').split(' ')
 for extra_lib_path in extra_lib_paths:
-    if extra_lib_path.lstrip().find('-L') == 0:
+	if extra_lib_path.lstrip().find('-L') == 0:
 		dir = extra_lib_path.lstrip().lstrip('-L')
 		if len(dir) > 0:
 			library_dirs.append(dir)
@@ -98,37 +85,79 @@ for extra_lib_path in extra_lib_paths:
 # Get extra include directories
 extra_inc_paths = ('@CPPFLAGS@').split(' ')
 for extra_inc_path in extra_inc_paths:
-    if extra_inc_path.lstrip().find('-I') == 0:
+	if extra_inc_path.lstrip().find('-I') == 0:
 		dir = extra_inc_path.lstrip().lstrip('-I')
 		if len(dir) > 0:
 			include_dirs.append(dir)
-# Add instrument specific include directories and data files
+# Add definitions for instrument specific modules
+inst_modules = []
 if '@WITH_INST_MWL_TRUE@' != '#':
 	print "Include multi-wavelength interface in gammalib Python bindings."
-	include_dirs.append('@top_srcdir@/inst/mwl/include')
-	data_files.extend(glob.glob('@top_srcdir@/inst/mwl/pyext/*.i'))
+	inst_modules.append('mwl')
 if '@WITH_INST_CTA_TRUE@' != '#':
 	print "Include CTA instrument interface in gammalib Python bindings."
-	include_dirs.append('@top_srcdir@/inst/cta/include')
-	data_files.extend(glob.glob('@top_srcdir@/inst/cta/pyext/*.i'))
+	inst_modules.append('cta')
 if '@WITH_INST_LAT_TRUE@' != '#':
 	print "Include Fermi/LAT instrument interface in gammalib Python bindings."
-	include_dirs.append('@top_srcdir@/inst/lat/include')
-	data_files.extend(glob.glob('@top_srcdir@/inst/lat/pyext/*.i'))
+	inst_modules.append('lat')
+
+# Set extension definition for core modules
+ext_modules = []
+py_modules  = []
+for module in core_modules:
+	
+	# Define module
+	ext_module = Extension('_'+module, [pkg_name+'/'+module+'_wrap.cpp'], \
+	                       include_dirs=include_dirs, \
+						   libraries=libraries,
+						   library_dirs=library_dirs,
+						   runtime_library_dirs=runtime_library_dirs)
+	ext_modules.append(ext_module)
+	py_modules.append(pkg_name+'.'+module)
+
+# Set extension definition for instrument dependent modules
+for module in inst_modules:
+
+	# Define paths
+	pyext_path   = '@top_srcdir@/inst/'+module+'/pyext'
+	include_path = '@top_srcdir@/inst/'+module+'/include'
+	
+	# Set include directories for module
+	include_inst_dirs = include_dirs
+	include_inst_dirs.append(include_path)
+	
+	# Add SWIG files to data_files
+	data_files.extend(glob.glob(pyext_path+'/*.i'))
+	
+	# Define module
+	ext_module = Extension('_'+module, [pyext_path+'/'+module+'_wrap.cpp'], \
+	                       include_dirs=include_dirs, \
+						   libraries=libraries,
+						   library_dirs=library_dirs,
+						   runtime_library_dirs=runtime_library_dirs)
+	ext_modules.append(ext_module)
+	py_modules.append(pkg_name+'.'+module)
+
+# Create gammalib/__init__.py file
+file = open(pkg_name+'/__init__.py', 'w')
+for module in core_modules:
+	file.write('from '+module+' import *\n')
+for module in inst_modules:
+	file.write('from '+module+' import *\n')
+file.close()
+
 # Setup
 setup(name='@PACKAGE_NAME@',
       version='@PACKAGE_VERSION@',
       description='gammalib Python bindings',
-      author='Jurgen Knodlseder',
+      author='Juergen Knoedlseder',
       author_email='@PACKAGE_BUGREPORT@',
       url='http://gammalib.sourceforge.net/',
-      py_modules=['gammalib'],
-      ext_modules=[Extension('_gammalib', ['gammalib_wrap.cpp'],
-                             include_dirs=include_dirs,
-                             library_dirs=library_dirs,
-                             libraries=libraries,
-                             runtime_library_dirs=runtime_library_dirs)],
-      data_files=[('@prefix@/share/gammalib/swig', data_files)],
-      )
+      packages=[pkg_name],
+      ext_package=pkg_name,
+      ext_modules=ext_modules,
+      py_modules=py_modules,
+	  )
+#data_files=[('@prefix@/share/gammalib/swig', data_files)],