From 914dd06cdd3944d78fff21aff0b1e744fcde687a Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 10:51:08 +0530 Subject: [PATCH] Cleanup: Remove outdated concore copies in testsou (#289) --- testsou/ccpymat.dir/concore.py | 79 ------------------ testsou/concore.py | 79 ------------------ testsou/concoredocker.py | 58 ------------- testsou/concoreold.py | 58 ------------- testsou/funbody.dir/concore2.py | 113 -------------------------- testsou/funcall.dir/concore2.py | 113 -------------------------- testsou/mix.dir/concore2.py | 106 ------------------------ testsou/pmcpymat.dir/concore.py | 79 ------------------ testsou/powermetermax.dir/concore2.py | 106 ------------------------ 9 files changed, 791 deletions(-) delete mode 100644 testsou/ccpymat.dir/concore.py delete mode 100644 testsou/concore.py delete mode 100644 testsou/concoredocker.py delete mode 100644 testsou/concoreold.py delete mode 100644 testsou/funbody.dir/concore2.py delete mode 100644 testsou/funcall.dir/concore2.py delete mode 100644 testsou/mix.dir/concore2.py delete mode 100644 testsou/pmcpymat.dir/concore.py delete mode 100644 testsou/powermetermax.dir/concore2.py diff --git a/testsou/ccpymat.dir/concore.py b/testsou/ccpymat.dir/concore.py deleted file mode 100644 index 3cbd8de3..00000000 --- a/testsou/ccpymat.dir/concore.py +++ /dev/null @@ -1,79 +0,0 @@ -import time -import os -from ast import literal_eval -import sys - -#if windows, create script to kill this process -# because batch files don't provide easy way to know pid of last command -# ignored for posix!=windows, because "concorepid" is handled by script -# ignored for docker (linux!=windows), because handled by docker stop -if hasattr(sys, 'getwindowsversion'): - with open("concorekill.bat","w") as fpid: - fpid.write("taskkill /F /PID "+str(os.getpid())+"\n") - -try: - iport = literal_eval(open("concore.iport").read()) -except Exception: - iport = dict() -try: - oport = literal_eval(open("concore.oport").read()) -except Exception: - oport = dict() - - - -s = '' -olds = '' -delay = 1 -retrycount = 0 -inpath = "./in" #must be rel path for local -outpath = "./out" - -def unchanged(): - global olds,s - if olds==s: - s = '' - return True - else: - olds = s - return False - -def read(port, name, initstr): - global s,simtime,retrycount - time.sleep(delay) - try: - infile = open(inpath+str(port)+"/"+name); - ins = infile.read() - except (OSError, IOError): - ins = initstr - while len(ins)==0: - time.sleep(delay) - ins = infile.read() - retrycount += 1 - s += ins - inval = literal_eval(ins) - simtime = max(simtime,inval[0]) - return inval[1:] - -def write(port, name, val, delta=0): - global outpath,simtime - if isinstance(val,str): - time.sleep(2*delay) - elif isinstance(val,list)==False: - print("mywrite must have list or str") - quit() - try: - with open(outpath+str(port)+"/"+name,"w") as outfile: - if isinstance(val,list): - outfile.write(str([simtime+delta]+val)) - else: - outfile.write(val) - except (OSError, IOError): - print("skipping"+outpath+str(port)+"/"+name); - -def initval(simtime_val): - global simtime - val = literal_eval(simtime_val) - simtime = val[0] - return val[1:] - diff --git a/testsou/concore.py b/testsou/concore.py deleted file mode 100644 index 3cbd8de3..00000000 --- a/testsou/concore.py +++ /dev/null @@ -1,79 +0,0 @@ -import time -import os -from ast import literal_eval -import sys - -#if windows, create script to kill this process -# because batch files don't provide easy way to know pid of last command -# ignored for posix!=windows, because "concorepid" is handled by script -# ignored for docker (linux!=windows), because handled by docker stop -if hasattr(sys, 'getwindowsversion'): - with open("concorekill.bat","w") as fpid: - fpid.write("taskkill /F /PID "+str(os.getpid())+"\n") - -try: - iport = literal_eval(open("concore.iport").read()) -except Exception: - iport = dict() -try: - oport = literal_eval(open("concore.oport").read()) -except Exception: - oport = dict() - - - -s = '' -olds = '' -delay = 1 -retrycount = 0 -inpath = "./in" #must be rel path for local -outpath = "./out" - -def unchanged(): - global olds,s - if olds==s: - s = '' - return True - else: - olds = s - return False - -def read(port, name, initstr): - global s,simtime,retrycount - time.sleep(delay) - try: - infile = open(inpath+str(port)+"/"+name); - ins = infile.read() - except (OSError, IOError): - ins = initstr - while len(ins)==0: - time.sleep(delay) - ins = infile.read() - retrycount += 1 - s += ins - inval = literal_eval(ins) - simtime = max(simtime,inval[0]) - return inval[1:] - -def write(port, name, val, delta=0): - global outpath,simtime - if isinstance(val,str): - time.sleep(2*delay) - elif isinstance(val,list)==False: - print("mywrite must have list or str") - quit() - try: - with open(outpath+str(port)+"/"+name,"w") as outfile: - if isinstance(val,list): - outfile.write(str([simtime+delta]+val)) - else: - outfile.write(val) - except (OSError, IOError): - print("skipping"+outpath+str(port)+"/"+name); - -def initval(simtime_val): - global simtime - val = literal_eval(simtime_val) - simtime = val[0] - return val[1:] - diff --git a/testsou/concoredocker.py b/testsou/concoredocker.py deleted file mode 100644 index 6fb582a2..00000000 --- a/testsou/concoredocker.py +++ /dev/null @@ -1,58 +0,0 @@ -import time -from ast import literal_eval - -s = '' -olds = '' -delay = 1 -retrycount = 0 -inpath = "/in" -outpath = "/out" - -def unchanged(): - global olds,s - if olds==s: - s = '' - return True - else: - olds = s - return False - -def read(port, name, initstr): - global s,simtime,retrycount - time.sleep(delay) - try: - infile = open(inpath+str(port)+"/"+name); - ins = infile.read() - except: - ins = initstr - while len(ins)==0: - time.sleep(delay) - ins = infile.read() - retrycount += 1 - s += ins - inval = literal_eval(ins) - simtime = max(simtime,inval[0]) - return inval[1:] - -def write(port, name, val, delta=0): - global outpath,simtime - if isinstance(val,str): - time.sleep(2*delay) - elif isinstance(val,list)==False: - print("mywrite must have list or str") - quit() - try: - with open(outpath+str(port)+"/"+name,"w") as outfile: - if isinstance(val,list): - outfile.write(str([simtime+delta]+val)) - else: - outfile.write(val) - except: - print("skipping"+outpath+str(port)+"/"+name); - -def initval(simtime_val): - global simtime - val = literal_eval(simtime_val) - simtime = val[0] - return val[1:] - diff --git a/testsou/concoreold.py b/testsou/concoreold.py deleted file mode 100644 index 310d2b53..00000000 --- a/testsou/concoreold.py +++ /dev/null @@ -1,58 +0,0 @@ -import time -from ast import literal_eval - -s = '' -olds = '' -delay = 1 -retrycount = 0 -inpath = "./in" -outpath = "./out" - -def unchanged(): - global olds,s - if olds==s: - s = '' - return True - else: - olds = s - return False - -def read(port, name, initstr): - global s,simtime,retrycount - time.sleep(delay) - try: - infile = open(inpath+str(port)+"/"+name); - ins = infile.read() - except: - ins = initstr - while len(ins)==0: - time.sleep(delay) - ins = infile.read() - retrycount += 1 - s += ins - inval = literal_eval(ins) - simtime = max(simtime,inval[0]) - return inval[1:] - -def write(port, name, val, delta=0): - global outpath,simtime - if isinstance(val,str): - time.sleep(2*delay) - elif isinstance(val,list)==False: - print("mywrite must have list or str") - quit() - try: - with open(outpath+str(port)+"/"+name,"w") as outfile: - if isinstance(val,list): - outfile.write(str([simtime+delta]+val)) - else: - outfile.write(val) - except: - print("skipping"+outpath+str(port)+"/"+name); - -def initval(simtime_val): - global simtime - val = literal_eval(simtime_val) - simtime = val[0] - return val[1:] - diff --git a/testsou/funbody.dir/concore2.py b/testsou/funbody.dir/concore2.py deleted file mode 100644 index e3ec817c..00000000 --- a/testsou/funbody.dir/concore2.py +++ /dev/null @@ -1,113 +0,0 @@ -import time -import os -from ast import literal_eval -import sys -import re - -#if windows, create script to kill this process -# because batch files don't provide easy way to know pid of last command -# ignored for posix!=windows, because "concorepid" is handled by script -# ignored for docker (linux!=windows), because handled by docker stop -if hasattr(sys, 'getwindowsversion'): - with open("concorekill.bat","w") as fpid: - fpid.write("taskkill /F /PID "+str(os.getpid())+"\n") - -try: - iport = literal_eval(open("concore.iport").read()) -except: - iport = dict() -try: - oport = literal_eval(open("concore.oport").read()) -except: - oport = dict() - - -s = '' -olds = '' -delay = 1 -retrycount = 0 -inpath = "./in" #must be rel path for local -outpath = "./out" - -#9/21/22 -try: - sparams = open(inpath+"1/concore.params").read() - if sparams[0] == '"': #windows keeps "" need to remove - sparams = sparams[1:] - sparams = sparams[0:sparams.find('"')] - if sparams != '{': - print("converting sparams: "+sparams) - sparams = "{'"+re.sub(';',",'",re.sub('=',"':",re.sub(' ','',sparams)))+"}" - print("converted sparams: " + sparams) - try: - params = literal_eval(sparams) - except: - print("bad params: "+sparams) -except: - params = dict() -#9/30/22 -def tryparam(n,i): - try: - return params[n] - except: - return i - - -#9/12/21 -def default_maxtime(default): - global maxtime - try: - maxtime = literal_eval(open(inpath+"1/concore.maxtime").read()) - except: - maxtime = default -default_maxtime(100) - -def unchanged(): - global olds,s - if olds==s: - s = '' - return True - else: - olds = s - return False - -def read(port, name, initstr): - global s,simtime,retrycount - time.sleep(delay) - try: - infile = open(inpath+str(port)+"/"+name); - ins = infile.read() - except: - ins = initstr - while len(ins)==0: - time.sleep(delay) - ins = infile.read() - retrycount += 1 - s += ins - inval = literal_eval(ins) - simtime = max(simtime,inval[0]) - return inval[1:] - -def write(port, name, val, delta=0): - global outpath,simtime - if isinstance(val,str): - time.sleep(2*delay) - elif isinstance(val,list)==False: - print("mywrite must have list or str") - quit() - try: - with open(outpath+str(port)+"/"+name,"w") as outfile: - if isinstance(val,list): - outfile.write(str([simtime+delta]+val)) - simtime += delta - else: - outfile.write(val) - except: - print("skipping"+outpath+str(port)+"/"+name); - -def initval(simtime_val): - global simtime - val = literal_eval(simtime_val) - simtime = val[0] - return val[1:] - diff --git a/testsou/funcall.dir/concore2.py b/testsou/funcall.dir/concore2.py deleted file mode 100644 index e3ec817c..00000000 --- a/testsou/funcall.dir/concore2.py +++ /dev/null @@ -1,113 +0,0 @@ -import time -import os -from ast import literal_eval -import sys -import re - -#if windows, create script to kill this process -# because batch files don't provide easy way to know pid of last command -# ignored for posix!=windows, because "concorepid" is handled by script -# ignored for docker (linux!=windows), because handled by docker stop -if hasattr(sys, 'getwindowsversion'): - with open("concorekill.bat","w") as fpid: - fpid.write("taskkill /F /PID "+str(os.getpid())+"\n") - -try: - iport = literal_eval(open("concore.iport").read()) -except: - iport = dict() -try: - oport = literal_eval(open("concore.oport").read()) -except: - oport = dict() - - -s = '' -olds = '' -delay = 1 -retrycount = 0 -inpath = "./in" #must be rel path for local -outpath = "./out" - -#9/21/22 -try: - sparams = open(inpath+"1/concore.params").read() - if sparams[0] == '"': #windows keeps "" need to remove - sparams = sparams[1:] - sparams = sparams[0:sparams.find('"')] - if sparams != '{': - print("converting sparams: "+sparams) - sparams = "{'"+re.sub(';',",'",re.sub('=',"':",re.sub(' ','',sparams)))+"}" - print("converted sparams: " + sparams) - try: - params = literal_eval(sparams) - except: - print("bad params: "+sparams) -except: - params = dict() -#9/30/22 -def tryparam(n,i): - try: - return params[n] - except: - return i - - -#9/12/21 -def default_maxtime(default): - global maxtime - try: - maxtime = literal_eval(open(inpath+"1/concore.maxtime").read()) - except: - maxtime = default -default_maxtime(100) - -def unchanged(): - global olds,s - if olds==s: - s = '' - return True - else: - olds = s - return False - -def read(port, name, initstr): - global s,simtime,retrycount - time.sleep(delay) - try: - infile = open(inpath+str(port)+"/"+name); - ins = infile.read() - except: - ins = initstr - while len(ins)==0: - time.sleep(delay) - ins = infile.read() - retrycount += 1 - s += ins - inval = literal_eval(ins) - simtime = max(simtime,inval[0]) - return inval[1:] - -def write(port, name, val, delta=0): - global outpath,simtime - if isinstance(val,str): - time.sleep(2*delay) - elif isinstance(val,list)==False: - print("mywrite must have list or str") - quit() - try: - with open(outpath+str(port)+"/"+name,"w") as outfile: - if isinstance(val,list): - outfile.write(str([simtime+delta]+val)) - simtime += delta - else: - outfile.write(val) - except: - print("skipping"+outpath+str(port)+"/"+name); - -def initval(simtime_val): - global simtime - val = literal_eval(simtime_val) - simtime = val[0] - return val[1:] - diff --git a/testsou/mix.dir/concore2.py b/testsou/mix.dir/concore2.py deleted file mode 100644 index 6471e0b7..00000000 --- a/testsou/mix.dir/concore2.py +++ /dev/null @@ -1,106 +0,0 @@ -import time -import os -from ast import literal_eval -import sys -import re - -#if windows, create script to kill this process -# because batch files don't provide easy way to know pid of last command -# ignored for posix!=windows, because "concorepid" is handled by script -# ignored for docker (linux!=windows), because handled by docker stop -if hasattr(sys, 'getwindowsversion'): - with open("concorekill.bat","w") as fpid: - fpid.write("taskkill /F /PID "+str(os.getpid())+"\n") - -try: - iport = literal_eval(open("concore.iport").read()) -except: - iport = dict() -try: - oport = literal_eval(open("concore.oport").read()) -except: - oport = dict() - - -s = '' -olds = '' -delay = 1 -retrycount = 0 -inpath = "./in" #must be rel path for local -outpath = "./out" - -#9/21/22 -try: - sparams = open(inpath+"1/concore.params").read() - if sparams[0] == '"': #windows keeps "" need to remove - sparams = sparams[1:] - sparams = sparams[0:sparams.find('"')] - if sparams != '{': - print("converting sparams: "+sparams) - sparams = "{'"+re.sub(',',",'",re.sub('=',"':",re.sub(' ','',sparams)))+"}" - print("converted sparams: " + sparams) - try: - params = literal_eval(sparams) - except: - print("bad params: "+sparams) -except: - params = dict() - -#9/12/21 -def default_maxtime(default): - global maxtime - try: - maxtime = literal_eval(open(inpath+"1/concore.maxtime").read()) - except: - maxtime = default -default_maxtime(100) - -def unchanged(): - global olds,s - if olds==s: - s = '' - return True - else: - olds = s - return False - -def read(port, name, initstr): - global s,simtime,retrycount - time.sleep(delay) - try: - infile = open(inpath+str(port)+"/"+name); - ins = infile.read() - except: - ins = initstr - while len(ins)==0: - time.sleep(delay) - ins = infile.read() - retrycount += 1 - s += ins - inval = literal_eval(ins) - simtime = max(simtime,inval[0]) - return inval[1:] - -def write(port, name, val, delta=0): - global outpath,simtime - if isinstance(val,str): - time.sleep(2*delay) - elif isinstance(val,list)==False: - print("mywrite must have list or str") - quit() - try: - with open(outpath+str(port)+"/"+name,"w") as outfile: - if isinstance(val,list): - outfile.write(str([simtime+delta]+val)) - simtime += delta - else: - outfile.write(val) - except: - print("skipping"+outpath+str(port)+"/"+name); - -def initval(simtime_val): - global simtime - val = literal_eval(simtime_val) - simtime = val[0] - return val[1:] - diff --git a/testsou/pmcpymat.dir/concore.py b/testsou/pmcpymat.dir/concore.py deleted file mode 100644 index eab7e448..00000000 --- a/testsou/pmcpymat.dir/concore.py +++ /dev/null @@ -1,79 +0,0 @@ -import time -import os -from ast import literal_eval -import sys - -#if windows, create script to kill this process -# because batch files don't provide easy way to know pid of last command -# ignored for posix!=windows, because "concorepid" is handled by script -# ignored for docker (linux!=windows), because handled by docker stop -if hasattr(sys, 'getwindowsversion'): - with open("concorekill.bat","w") as fpid: - fpid.write("taskkill /F /PID "+str(os.getpid())+"\n") - -try: - iport = literal_eval(open("concore.iport").read()) -except: - iport = dict() -try: - oport = literal_eval(open("concore.oport").read()) -except: - oport = dict() - - - -s = '' -olds = '' -delay = 1 -retrycount = 0 -inpath = "./in" #must be rel path for local -outpath = "./out" - -def unchanged(): - global olds,s - if olds==s: - s = '' - return True - else: - olds = s - return False - -def read(port, name, initstr): - global s,simtime,retrycount - time.sleep(delay) - try: - infile = open(inpath+str(port)+"/"+name); - ins = infile.read() - except: - ins = initstr - while len(ins)==0: - time.sleep(delay) - ins = infile.read() - retrycount += 1 - s += ins - inval = literal_eval(ins) - simtime = max(simtime,inval[0]) - return inval[1:] - -def write(port, name, val, delta=0): - global outpath,simtime - if isinstance(val,str): - time.sleep(2*delay) - elif isinstance(val,list)==False: - print("mywrite must have list or str") - quit() - try: - with open(outpath+str(port)+"/"+name,"w") as outfile: - if isinstance(val,list): - outfile.write(str([simtime+delta]+val)) - else: - outfile.write(val) - except: - print("skipping"+outpath+str(port)+"/"+name); - -def initval(simtime_val): - global simtime - val = literal_eval(simtime_val) - simtime = val[0] - return val[1:] - diff --git a/testsou/powermetermax.dir/concore2.py b/testsou/powermetermax.dir/concore2.py deleted file mode 100644 index 6471e0b7..00000000 --- a/testsou/powermetermax.dir/concore2.py +++ /dev/null @@ -1,106 +0,0 @@ -import time -import os -from ast import literal_eval -import sys -import re - -#if windows, create script to kill this process -# because batch files don't provide easy way to know pid of last command -# ignored for posix!=windows, because "concorepid" is handled by script -# ignored for docker (linux!=windows), because handled by docker stop -if hasattr(sys, 'getwindowsversion'): - with open("concorekill.bat","w") as fpid: - fpid.write("taskkill /F /PID "+str(os.getpid())+"\n") - -try: - iport = literal_eval(open("concore.iport").read()) -except: - iport = dict() -try: - oport = literal_eval(open("concore.oport").read()) -except: - oport = dict() - - -s = '' -olds = '' -delay = 1 -retrycount = 0 -inpath = "./in" #must be rel path for local -outpath = "./out" - -#9/21/22 -try: - sparams = open(inpath+"1/concore.params").read() - if sparams[0] == '"': #windows keeps "" need to remove - sparams = sparams[1:] - sparams = sparams[0:sparams.find('"')] - if sparams != '{': - print("converting sparams: "+sparams) - sparams = "{'"+re.sub(',',",'",re.sub('=',"':",re.sub(' ','',sparams)))+"}" - print("converted sparams: " + sparams) - try: - params = literal_eval(sparams) - except: - print("bad params: "+sparams) -except: - params = dict() - -#9/12/21 -def default_maxtime(default): - global maxtime - try: - maxtime = literal_eval(open(inpath+"1/concore.maxtime").read()) - except: - maxtime = default -default_maxtime(100) - -def unchanged(): - global olds,s - if olds==s: - s = '' - return True - else: - olds = s - return False - -def read(port, name, initstr): - global s,simtime,retrycount - time.sleep(delay) - try: - infile = open(inpath+str(port)+"/"+name); - ins = infile.read() - except: - ins = initstr - while len(ins)==0: - time.sleep(delay) - ins = infile.read() - retrycount += 1 - s += ins - inval = literal_eval(ins) - simtime = max(simtime,inval[0]) - return inval[1:] - -def write(port, name, val, delta=0): - global outpath,simtime - if isinstance(val,str): - time.sleep(2*delay) - elif isinstance(val,list)==False: - print("mywrite must have list or str") - quit() - try: - with open(outpath+str(port)+"/"+name,"w") as outfile: - if isinstance(val,list): - outfile.write(str([simtime+delta]+val)) - simtime += delta - else: - outfile.write(val) - except: - print("skipping"+outpath+str(port)+"/"+name); - -def initval(simtime_val): - global simtime - val = literal_eval(simtime_val) - simtime = val[0] - return val[1:] -