more work on Windows compilation & fix binary loc for k-vec

Author: briantoby

GSASII/k_vector_search.py

@@ -33,6 +33,8 @@
 import numpy as np
 from scipy.optimize import linear_sum_assignment
 from . import GSASIIfiles as G2fil
+from . import GSASIIpath
+GSASIIpath.SetBinaryPath()
 
 gen_option_avail = True
 try:
@@ -41,8 +43,15 @@
     G2fil.NeededPackage({'magnetic k-vector search':['seekpath']})
     print('k_vector_search: seekpath could not be imported')
     gen_option_avail = False
+
 try:
-    from GSASII.kvec_general import parallel_proc
+    if GSASIIpath.binaryPath:
+        import kvec_general
+    else:
+        from . import kvec_general
+except ImportError:
+    print('binary load error: kvec_general not found')
+    gen_option_avail = False
 except ModuleNotFoundError:
     print('k_vector_search: kvec_general could not be imported')
     gen_option_avail = False
@@ -629,7 +638,7 @@ def kOptFinder(self) -> list:
                     points = np.array(np.meshgrid(a_array, b_array, c_array))
                     points = points.T.reshape(-1, 3)
 
-                    results = parallel_proc(
+                    results = kvec_general.parallel_proc(
                         points,
                         self.nucPeaks,
                         self.superPeaks,

sources/install.bat

@@ -6,3 +6,7 @@ copy /y "%MESON_BUILD_ROOT%\sources\k_vec_cython\"*.pyd %OUTDIR%\
 copy /y "%MESON_BUILD_ROOT%\sources\"LATTIC.exe %OUTDIR%\
 copy /y "%MESON_BUILD_ROOT%\sources\"convcell.exe %OUTDIR%\
 copy /y "%MESON_BUILD_ROOT%\sources\"GSAS*.txt %OUTDIR%\
+copy /y %CONDA_PREFIX%\Library\bin\libgfortran.dll %OUTDIR%\
+copy /y %CONDA_PREFIX%\Library\bin\libquadmath*.dll %OUTDIR%\
+copy /y %CONDA_PREFIX%\Library\bin\libgcc*.dll %OUTDIR%\
+REM copy /y %CONDA_PREFIX%\Library\bin\libwinthread*.dll %OUTDIR%\

sources/sysinstall.bat

@@ -5,3 +5,7 @@ copy /y "%MESON_BUILD_ROOT%\sources\k_vec_cython\"*.pyd %OUTDIR%\
 copy /y "%MESON_BUILD_ROOT%\sources\"LATTIC.exe %OUTDIR%\
 copy /y "%MESON_BUILD_ROOT%\sources\"convcell.exe %OUTDIR%\
 copy /y "%MESON_BUILD_ROOT%\sources\"GSAS*.txt %OUTDIR%\
+copy /y %CONDA_PREFIX%\Library\bin\libgfortran.dll %OUTDIR%\
+copy /y %CONDA_PREFIX%\Library\bin\libquadmath*.dll %OUTDIR%\
+copy /y %CONDA_PREFIX%\Library\bin\libgcc*.dll %OUTDIR%\
+REM copy /y %CONDA_PREFIX%\Library\bin\libwinthread*.dll %OUTDIR%\