Changeset 626

Timestamp:

12/08/17 15:11:38 (6 years ago)

Author:

dubos

Message:

devel : some improvements to build Python part

Location:

codes/icosagcm/devel

Files:

• Python/codegen (modified) (1 diff)
• Python/src/setup.py (modified) (1 diff)
• make_python (modified) (3 diffs)

codes/icosagcm/devel/Python/codegen

@@ -57 +57 @@
     SRCDIR=$ROOT/src
     cd $SRCDIR
+    grep FIXME *.jin
 
     for x in $* ; do
         echo "Generating code for variant : $x"
-        grep FIXME *.jin
         main $x
     done

codes/icosagcm/devel/Python/src/setup.py

@@ -1 +1 @@
 from distutils.core import setup
+from distutils.extension import Extension
 from Cython.Build import cythonize
 setup(  name = "DYNAMICO kernels for unstructured mesh",
-        ext_modules = cythonize(["*.pyx"]) )
+        ext_modules = cythonize([
+            Extension("xios",["xios.pyx"],libraries=["xios"]),
+            Extension("unstructured",["unstructured.pyx"],libraries=["icosa","xios"])
+            ])
+        )

codes/icosagcm/devel/make_python

@@ -17 +17 @@
 {
  diff $2 $1 || log cp -pr $1 $2
+}
+
+function cmd_clean() # this function is invoked by : './make_python clean'
+{
+    rm -f lib/*.so lib/dynamico
+    cd $KERNELS/src
+    rm -rf *.o *.so build/
 }
 
@@ -50 +57 @@
         rm -f tmp.a
         cp $ARLIB tmp.a
-        ar vd tmp.a $4
-        ar vr tmp.a $5
+        if [[ "$4" != "" ]] ; then ar vd tmp.a $4 ; fi
+        if [[ "$5" != "" ]] ; then ar vr tmp.a $5 ; fi
         log $LINK $SOFLAGS $WHOLE_ARCHIVE tmp.a $NO_WHOLE_ARCHIVE $3 -o $SOLIB
         rm -f tmp.a
@@ -61 +68 @@
 function cmd_()
 {
+    echo "XIOS_ROOTDIR : $XIOS_ROOTDIR"
     MISSING=""
     for module in netCDF4 jinja2 mpi4py; do