Index: wflow-py/UnitTests/wflow_sceleton/outstate/TSoil.map =================================================================== diff -u -r4e9b486108b18b4a3c8a5971fbf20501a88add1c -rfc8c8509cb4020a42aea1a714e6d7887168d69b1 Binary files differ Index: wflow-py/_version.py =================================================================== diff -u -rf86d3deb279b6058060e2762cfe64899ef322e10 -rfc8c8509cb4020a42aea1a714e6d7887168d69b1 --- wflow-py/_version.py (.../_version.py) (revision f86d3deb279b6058060e2762cfe64899ef322e10) +++ wflow-py/_version.py (.../_version.py) (revision fc8c8509cb4020a42aea1a714e6d7887168d69b1) @@ -1,4 +1,4 @@ VERSION="1.0.2016.03.1" MVERSION="1.0.2016.03" NVERSION="1.0.1" -BUILD="2016-11-04 10:48:33.994000" +BUILD="2016-11-09 09:25:35.812000" Index: wflow-py/make_wflow_exe_cx.py =================================================================== diff -u -r9f2cb7978fcc2e5676fae0f34463fab148d3739c -rfc8c8509cb4020a42aea1a714e6d7887168d69b1 --- wflow-py/make_wflow_exe_cx.py (.../make_wflow_exe_cx.py) (revision 9f2cb7978fcc2e5676fae0f34463fab148d3739c) +++ wflow-py/make_wflow_exe_cx.py (.../make_wflow_exe_cx.py) (revision fc8c8509cb4020a42aea1a714e6d7887168d69b1) @@ -6,7 +6,47 @@ import scipy import sys +pdir = os.path.dirname(sys.executable) + "/" +# list comes from: c:\Anaconda\conda-meta\mkl-11.3.3-1.json +MKL_files= [pdir + "Library/bin/cilkrts20.dll", + pdir + "Library/bin/ifdlg100.dll", + pdir + "Library/bin/libchkp.dll", + pdir + "Library/bin/libicaf.dll", + pdir + "Library/bin/libifcoremd.dll", + pdir + "Library/bin/libifcoremdd.dll", + pdir + "Library/bin/libifcorert.dll", + pdir + "Library/bin/libifcorertd.dll", + pdir + "Library/bin/libifportmd.dll", + pdir + "Library/bin/libimalloc.dll", + pdir + "Library/bin/libiomp5md.dll", + pdir + "Library/bin/libiompstubs5md.dll", + pdir + "Library/bin/libmmd.dll", + pdir + "Library/bin/libmmdd.dll", + pdir + "Library/bin/libmpx.dll", + pdir + "Library/bin/liboffload.dll", + pdir + "Library/bin/mkl_avx.dll", + pdir + "Library/bin/mkl_avx2.dll", + pdir + "Library/bin/mkl_avx512.dll", + pdir + "Library/bin/mkl_core.dll", + pdir + "Library/bin/mkl_def.dll", + pdir + "Library/bin/mkl_intel_thread.dll", + pdir + "Library/bin/mkl_mc.dll", + pdir + "Library/bin/mkl_mc3.dll", + pdir + "Library/bin/mkl_msg.dll", + pdir + "Library/bin/mkl_rt.dll", + pdir + "Library/bin/mkl_sequential.dll", + pdir + "Library/bin/mkl_tbb_thread.dll", + pdir + "Library/bin/mkl_vml_avx.dll", + pdir + "Library/bin/mkl_vml_avx2.dll", + pdir + "Library/bin/mkl_vml_avx512.dll", + pdir + "Library/bin/mkl_vml_cmpt.dll", + pdir + "Library/bin/mkl_vml_def.dll", + pdir + "Library/bin/mkl_vml_mc.dll", + pdir + "Library/bin/mkl_vml_mc2.dll", + pdir + "Library/bin/mkl_vml_mc3.dll", + pdir + "Library/bin/svml_dispmd.dll"] + os.system("python mkversion.py") target = 'openda' @@ -50,6 +90,7 @@ data_files.extend(mkdatatuples(mpldir[1],destdir=ddir)) +data_files.extend(mkdatatuples(MKL_files,destdir=".")) # pcraster dll's ddir = "c:/pcraster/lib/" data_files.extend(mkdatatuples(glob.glob(ddir + "/*.dll"),destdir='.')) @@ -64,11 +105,12 @@ thename = "Wflow"+MVERSION+'-'+nrbits -packages = ["osgeo"] +packages = ["osgeo","numpy"] if target == 'openda': - includes = ['wflow.wflow_bmi','wflow.wflow_w3ra','wflow.wflow_bmi_combined'] + includes = ['wflow.wflow_bmi','wflow.wflow_w3ra','wflow.wflow_bmi_combined', + 'thrift.transport','thrift.protocol','thrift.server'] packages.append('openda_bmi') else: includes = ['wflow.wflow_bmi', 'wflow.wflow_w3ra', 'wflow.wflow_bmi_combined'] Index: wflow-py/wflow/__init__.py =================================================================== diff -u -rf86d3deb279b6058060e2762cfe64899ef322e10 -rfc8c8509cb4020a42aea1a714e6d7887168d69b1 --- wflow-py/wflow/__init__.py (.../__init__.py) (revision f86d3deb279b6058060e2762cfe64899ef322e10) +++ wflow-py/wflow/__init__.py (.../__init__.py) (revision fc8c8509cb4020a42aea1a714e6d7887168d69b1) @@ -2,5 +2,5 @@ __version__="1.0.2016.03" __release__="1.0.2016.03.1" __versionnr__="1.0.1" -__build__="2016-11-04 10:48:33.994000" +__build__="2016-11-09 09:25:35.812000" import osgeo.gdal as gdal \ No newline at end of file