Merge remote-tracking branch 'origin'

Author: jtwhite79

benchmarks/basic_tests.py

@@ -8,12 +8,16 @@
 import pyemu
 
 bin_path = os.path.join("test_bin")
+plat = "unknown"
 if "linux" in platform.platform().lower():
     bin_path = os.path.join(bin_path,"linux")
+    plat = "linux"
 elif "darwin" in platform.platform().lower() or "macos" in platform.platform().lower() :
     bin_path = os.path.join(bin_path,"mac")
+    plat = "apple"
 else:
     bin_path = os.path.join(bin_path,"win")
+    plat = "windows"
 
 bin_path = os.path.abspath("test_bin")
 os.environ["PATH"] += os.pathsep + bin_path
@@ -43,6 +47,60 @@
 num_reals = 20
 port = 4021
 
+
+def nonascii_path_test(model_d="ies_10par_xsec"):
+    pyemu.Ensemble.reseed()
+    base_d = os.path.join(model_d, "template")
+    new_d = os.path.join(model_d, "test_template_\u0187")
+    if os.path.exists(new_d):
+        shutil.rmtree(new_d)
+    shutil.copytree(base_d, new_d)
+    print(platform.platform().lower())
+    pst = pyemu.Pst(os.path.join(new_d, "pest.pst"))
+    cmd = pst.model_command[0].split()
+    print(cmd)
+    cmd = "\"\"{0}\" \"{1}\"\"".format(cmd[0],cmd[1])
+    print(cmd)
+    pst.model_command.append(cmd)
+    cmd = pst.model_command[0].split()
+    cmd = "\"\'{0}\' \'{1}\'\"".format(cmd[0],cmd[1])
+    pst.model_command.append(cmd)
+
+    tpl_data = pst.model_input_data
+    tpl_data["pest_file"] = tpl_data.pest_file.apply(lambda x: "\"{0}\"".format(x))
+    tpl_data["model_file"] = tpl_data.model_file.apply(lambda x: "\"{0}\"".format(x))
+    
+    ins_data = pst.model_output_data
+    ins_data["pest_file"] = ins_data.pest_file.apply(lambda x: "\"{0}\"".format(x))
+    ins_data["model_file"] = ins_data.model_file.apply(lambda x: "\"{0}\"".format(x))
+    
+    pst.control_data.noptmax = 1
+    pst.observation_data.loc[pst.nnz_obs_names,"weight"] = 1.0
+    #pst.pestpp_options["panther_agent_freeze_on_fail"] = True
+    pst.pestpp_options["ies_num_reals"] = 5
+    pst.write(os.path.join(new_d, "pest.pst"))
+
+    
+    m_d = os.path.join(model_d,"master_pestpp")
+    if os.path.exists(m_d):
+        shutil.rmtree(m_d)
+    shutil.copytree(new_d,m_d)
+
+    worker_root = os.path.join(model_d + "_\u0187")
+    if os.path.exists(worker_root):
+        shutil.rmtree(worker_root)
+    os.makedirs(worker_root)    
+    try:
+        pyemu.os_utils.start_workers(new_d, exe_path, "pest.pst", 1, master_dir=m_d,
+                               worker_root=worker_root,port=port,verbose=True)
+    except Exception as e:
+        if plat != "windows":
+            raise Exception(e)
+    else:
+        if plat == "windows":
+            raise Exception("should have failed")
+
+
 def basic_test(model_d="ies_10par_xsec"):
     pyemu.Ensemble.reseed()
     base_d = os.path.join(model_d, "template")
@@ -57,7 +115,38 @@ def basic_test(model_d="ies_10par_xsec"):
     cmd = "\"\"{0}\" \"{1}\"\"".format(cmd[0],cmd[1])
     print(cmd)
     pst.model_command.append(cmd)
+    cmd = pst.model_command[0].split()
+    cmd = "\"\'{0}\' \'{1}\'\"".format(cmd[0],cmd[1])
+    pst.model_command.append(cmd)
+
+    tpl_data = pst.model_input_data
+    tpl_data["pest_file"] = tpl_data.pest_file.apply(lambda x: "\"{0}\"".format(x))
+    tpl_data["model_file"] = tpl_data.model_file.apply(lambda x: "\"{0}\"".format(x))
 
+    ins_data = pst.model_output_data
+    ins_data["pest_file"] = ins_data.pest_file.apply(lambda x: "\"{0}\"".format(x))
+    ins_data["model_file"] = ins_data.model_file.apply(lambda x: "\"{0}\"".format(x))
+    
+    pst.control_data.noptmax = 0
+    pst.write(os.path.join(new_d, "pest.pst"))
+    pyemu.os_utils.run("{0} pest.pst".format(exe_path),cwd=new_d)
+    # pst.write(os.path.join(new_d, "pest.pst"),version=2)
+    # pyemu.os_utils.run("{0} pest.pst".format(exe_path),cwd=new_d)
+    
+    tpl_data = pst.model_input_data
+    tpl_data["pest_file"] = tpl_data.pest_file.apply(lambda x: "\'{0}\'".format(x))
+    tpl_data["model_file"] = tpl_data.model_file.apply(lambda x: "\'{0}\'".format(x))
+    
+    ins_data = pst.model_output_data
+    ins_data["pest_file"] = ins_data.pest_file.apply(lambda x: "\'{0}\'".format(x))
+    ins_data["model_file"] = ins_data.model_file.apply(lambda x: "\'{0}\'".format(x))
+
+    pst.control_data.noptmax = 0
+    pst.write(os.path.join(new_d, "pest.pst"))
+    pyemu.os_utils.run("{0} pest.pst".format(exe_path),cwd=new_d)
+    # pst.write(os.path.join(new_d, "pest.pst"),version=2)
+    # pyemu.os_utils.run("{0} pest.pst".format(exe_path),cwd=new_d)
+
     # set first par as fixed
     #pst.parameter_data.loc[pst.par_names[0], "partrans"] = "fixed"
 
@@ -2030,11 +2119,15 @@ def mf6_v5_ies_nonpersistent_test():
     assert found ==  num_workers
 
 
-
+def parse_pst_test():
+    t_d = os.path.join("parse_pst_testfiles","kerry")
+    pyemu.os_utils.run("{0} control.pst".format(exe_path),cwd=t_d)
 
 
 if __name__ == "__main__":
-    basic_test()
+    #parse_pst_test()
+    #basic_test()
+    nonascii_path_test()
 
     #mf6_v5_ies_nonpersistent_test()
     #large_fake_test()
@@ -2049,7 +2142,7 @@ def mf6_v5_ies_nonpersistent_test():
     #plot_collapse_invest()
 
     #run()
-    # mf6_v5_ies_test()
+    #mf6_v5_ies_test()
     #prep_ends()
     #sweep_bin_test()
     # mf6_v5_sen_test()
@@ -2096,7 +2189,7 @@ def mf6_v5_ies_nonpersistent_test():
     #mf6_v5_sen_test()
 
     #shutil.copy2(os.path.join("..","exe","windows","x64","Debug","pestpp-opt.exe"),os.path.join("..","bin","win","pestpp-opt.exe"))
-    mf6_v5_opt_stack_test()
+    #mf6_v5_opt_stack_test()
     # mf6_v5_glm_test()
     # mf6_v5_ies_test()
     #cmdline_test()

benchmarks/henry_test.py

@@ -318,7 +318,7 @@ def setup_pst():
     pf.pst.pestpp_options["opt_dec_var_groups"] = "dv_pars"
     pf.pst.pestpp_options["panther_echo"] = True
     pf.pst.pestpp_options["mou_risk_objective"] = True
-    pf.pst.pestpp_options["mou_generator"] = "de"
+    pf.pst.pestpp_options["mou_generator"] = "pso"
     pf.pst.pestpp_options["mou_population_size"] = 100
 
     pf.pst.try_parse_name_metadata()
@@ -618,8 +618,8 @@ def invest():
 
 
 
-def run_mou(risk_obj=False,chance_points="single",risk=0.5,stack_size=100,
-            num_workers=12,pop_size=100,tag="",recalc_every=100000,noptmax=100):
+def run_mou(risk_obj=False,chance_points="single",risk=0.5,stack_size=10,
+            num_workers=12,pop_size=10,tag="",recalc_every=100000,noptmax=3):
     t_d = os.path.join("henry","henry_template")
     pst = pyemu.Pst(os.path.join(t_d,"henry.pst"))
     pst.pestpp_options["opt_par_stack"] = "prior.jcb"
@@ -793,7 +793,7 @@ def simple_henry_test():
 
     plot_domain(os.path.join("henry", "henry_temp"))
     setup_pst()
-    run_mou(risk=0.65,tag="65_single_once",num_workers=10,noptmax=10,pop_size=50,stack_size=30)
+    run_mou(risk=0.65,tag="65_single_once",num_workers=10,noptmax=10,pop_size=10,stack_size=10)
 
 
 

benchmarks/ies_10par_xsec/template/pest.pst

@@ -50,11 +50,9 @@ head
  h02_09                4.7000000000E+00      0.0000000000E+00       head                 
  h02_10                5.1000000000E+00      0.0000000000E+00       head                 
 * model command line
-mfnwt ./10par_xsec.nam
+mfnwt 10par_xsec.nam
 * model input/output
-.\hk_Layer_1.ref.tpl .\hk_Layer_1.ref
-.\hk_Layer_1.ref.tpl .\nested/really\deep/hk_Layer_1.ref
-.\strt_Layer_1.ref.tpl .\strt_Layer_1.ref
-.\10par_xsec.hds.ins .\10par_xsec.hds
-++panther_transfer_on_finish(10par_xsec.hds,10par_xsec.list)
-++ies_num_reals(5)
+hk_Layer_1.ref.tpl hk_Layer_1.ref
+hk_Layer_1.ref.tpl nested/really\deep/hk_Layer_1.ref
+strt_Layer_1.ref.tpl strt_Layer_1.ref
+10par_xsec.hds.ins 10par_xsec.hds