Skip to content

(Revised PR #132) Fixing Issue #124 , Implemented Logging for debugging in mkconcore.py #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pradeeban merged 1 commit into from
Feb 26, 2025
Merged

(Revised PR #132) Fixing Issue #124 , Implemented Logging for debugging in mkconcore.py #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 48 additions & 50 deletions mkconcore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
INDIRNAME = ":/in"
OUTDIRNAME = ":/out"

logging.basicConfig(
level=logging.INFO,
format='%(message)s' if TRIMMED_LOGS else '%(asctime)s %(levelname)-8s %(message)s',
datefmt='%Y-%m-%d %H:%M:%S'
)

if os.path.exists(CONCOREPATH+"/concore.octave"):
M_IS_OCTAVE = True #treat .m as octave 9/27/21
Expand All @@ -46,20 +51,20 @@
sourcedir = sys.argv[2]
outdir = sys.argv[3]
if not os.path.isdir(sourcedir):
print(sourcedir+" does not exist")
logging.error(f"{sourcedir} does not exist")
quit()

if len(sys.argv) < 4:
print("usage: py mkconcore.py file.graphml sourcedir outdir [type]")
print(" type must be posix (macos or ubuntu), windows, or docker")
logging.error("usage: py mkconcore.py file.graphml sourcedir outdir [type]")
logging.error(" type must be posix (macos or ubuntu), windows, or docker")
quit()
elif len(sys.argv) == 4:
prefixedgenode = outdir+"_" #nodes and edges prefixed with outdir_ only in case no type specified 3/24/21
concoretype = "docker"
else:
concoretype = sys.argv[4]
if not (concoretype in ["posix","windows","docker","macos","ubuntu"]):
print(" type must be posix (macos or ubuntu), windows, or docker")
logging.error(" type must be posix (macos or ubuntu), windows, or docker")
quit()
ubuntu = False #6/24/21
if concoretype == "ubuntu":
Expand All @@ -69,8 +74,8 @@
concoretype = "posix"

if os.path.exists(outdir):
print(outdir+" already exists")
print("if intended, remove or rename "+outdir+" first")
logging.error(f"{outdir} already exists")
logging.error(f"if intended, Remove/Rename {outdir} first")
quit()

os.mkdir(outdir)
Expand All @@ -97,22 +102,16 @@

os.mkdir("src")
os.chdir("..")

print("mkconcore "+MKCONCORE_VER)
print("concore path: "+CONCOREPATH)
print("graphml input: "+GRAPHML_FILE)
print("source directory: "+sourcedir)
print("output directory: "+outdir)
print("control core type: "+concoretype)
print("treat .m as octave:"+str(M_IS_OCTAVE))
print("MCR path: "+MCRPATH)
print("Docker repository: "+DOCKEREPO)

# Output in a preferred format.
if TRIMMED_LOGS:
logging.basicConfig(level=logging.INFO, format='%(message)s')
else:
logging.basicConfig(level=logging.INFO, format='%(asctime)s %(levelname)-8s %(message)s', datefmt='%Y-%m-%d %H:%M:%S')

logging.info(f"mkconcore {MKCONCORE_VER}")
logging.info(f"Concore path: {CONCOREPATH}")
logging.info(f"graphml input: {GRAPHML_FILE}")
logging.info(f"source directory: {sourcedir}")
logging.info(f"output directory: {outdir}")
logging.info(f"control core type: {concoretype}")
logging.info(f"treat .m as octave: {str(M_IS_OCTAVE)}")
logging.info(f"MCR path: {MCRPATH}")
logging.info(f"Docker repository: {DOCKEREPO}")

f = open(GRAPHML_FILE, "r")
text_str = f.read()
Expand Down Expand Up @@ -181,7 +180,7 @@
ms += mp

if (ms == 0).any():
print("not all nodes reachable")
logging.warning("Unreachable nodes detected")

#not right for PM2_1_1 and PM2_1_2
volswr = len(nodes_dict)*['']
Expand Down Expand Up @@ -211,7 +210,7 @@
try:
fsource = open(sourcedir+"/"+sourcecode)
except:
print(sourcecode+" does not exist in "+sourcedir)
logging.error(f"{sourcecode} not found in {sourcedir}")
quit()
with open(outdir+"/src/"+sourcecode,"w") as fcopy:
fcopy.write(fsource.read())
Expand All @@ -221,9 +220,9 @@
fsource = open(sourcedir+"/Dockerfile."+dockername)
with open(outdir+"/src/Dockerfile."+dockername,"w") as fcopy:
fcopy.write(fsource.read())
print(" Using custom Dockerfile for "+dockername)
logging.info(f"Using custom Dockerfile for {dockername}")
except:
print(" Using default Dockerfile for "+dockername)
logging.info(f"Using default Dockerfile for {dockername}")
fsource.close()
if os.path.isdir(sourcedir+"/"+dockername+".dir"):
shutil.copytree(sourcedir+"/"+dockername+".dir",outdir+"/src/"+dockername+".dir")
Expand All @@ -235,7 +234,7 @@
else:
fsource = open(CONCOREPATH+"/concore.py")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/concore.py","w") as fcopy:
fcopy.write(fsource.read())
Expand All @@ -248,7 +247,7 @@
else:
fsource = open(CONCOREPATH+"/concore.hpp")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/concore.hpp","w") as fcopy:
fcopy.write(fsource.read())
Expand All @@ -261,7 +260,7 @@
else:
fsource = open(CONCOREPATH+"/concore.v")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/concore.v","w") as fcopy:
fcopy.write(fsource.read())
Expand All @@ -271,7 +270,7 @@
try:
fsource = open(CONCOREPATH+"/mkcompile")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/mkcompile","w") as fcopy:
fcopy.write(fsource.read())
Expand All @@ -282,55 +281,55 @@
try: #maxtime in matlab 11/22/21
fsource = open(CONCOREPATH+"/concore_default_maxtime.m")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/concore_default_maxtime.m","w") as fcopy:
fcopy.write(fsource.read())
fsource.close()
try:
fsource = open(CONCOREPATH+"/concore_unchanged.m")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/concore_unchanged.m","w") as fcopy:
fcopy.write(fsource.read())
fsource.close()
try:
fsource = open(CONCOREPATH+"/concore_read.m")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/concore_read.m","w") as fcopy:
fcopy.write(fsource.read())
fsource.close()
try:
fsource = open(CONCOREPATH+"/concore_write.m")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/concore_write.m","w") as fcopy:
fcopy.write(fsource.read())
fsource.close()
try: #4/9/21
fsource = open(CONCOREPATH+"/concore_initval.m")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/concore_initval.m","w") as fcopy:
fcopy.write(fsource.read())
fsource.close()
try: #11/19/21
fsource = open(CONCOREPATH+"/concore_iport.m")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/concore_iport.m","w") as fcopy:
fcopy.write(fsource.read())
fsource.close()
try: #11/19/21
fsource = open(CONCOREPATH+"/concore_oport.m")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/concore_oport.m","w") as fcopy:
fcopy.write(fsource.read())
Expand All @@ -341,7 +340,7 @@
else:
fsource = open(CONCOREPATH+"/import_concore.m")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/import_concore.m","w") as fcopy:
fcopy.write(fsource.read())
Expand All @@ -359,7 +358,7 @@
if len(sourcecode)!=0 and sourcecode.find(".")!=-1: #3/28/21
dockername,langext = sourcecode.split(".")
if os.path.exists(outdir+"/src/"+dockername+".iport"):
print("warning: "+dockername+" has multiple instantiations; iport/oport may be invalid")
logging.warning(f"{dockername} has multiple instantiations ; iport/oport may be invalid")
with open(outdir+"/src/"+dockername+".iport", "w") as fport:
if prefixedgenode == "": # 5/18/21
fport.write(str(iportmap_dict))
Expand Down Expand Up @@ -400,21 +399,21 @@
try:
if langext=="py":
fsource = open(CONCOREPATH+"/Dockerfile.py")
print("assuming .py extension for Dockerfile")
logging.info("assuming .py extension for Dockerfile")
elif langext == "cpp": # 6/22/21
fsource = open(CONCOREPATH+"/Dockerfile.cpp")
print("assuming .cpp extension for Dockerfile")
logging.info("assuming .cpp extension for Dockerfile")
elif langext == "v": # 6/26/21
fsource = open(CONCOREPATH+"/Dockerfile.v")
print("assuming .v extension for Dockerfile")
logging.info("assuming .v extension for Dockerfile")
elif langext == "sh": # 5/19/21
fsource = open(CONCOREPATH+"/Dockerfile.sh")
print("assuming .sh extension for Dockerfile")
logging.info("assuming .sh extension for Dockerfile")
else:
print("assuming .m extension for Dockerfile")
fsource = open(CONCOREPATH+"/Dockerfile.m")
logging.info("assuming .m extension for Dockerfile")
except:
print(CONCOREPATH+" is not correct path to concore")
logging.error(f"{CONCOREPATH} is not correct path to concore")
quit()
with open(outdir+"/src/Dockerfile."+dockername,"w") as fcopy:
fcopy.write(fsource.read())
Expand Down Expand Up @@ -467,11 +466,11 @@
containername,sourcecode = nodes_dict[node].split(':')
if len(sourcecode)!=0:
if sourcecode.find(".")==-1:
print(DOCKEREXE+' run --name='+containername+volswr[i]+volsro[i]+" "+DOCKEREPO+"/docker-"+sourcecode)
logging.debug(f"Generating Docker run command: {DOCKEREXE} run --name={containername+volswr[i]+volsro[i]} {DOCKEREPO}/docker- {sourcecode}")
frun.write(DOCKEREXE+' run --name='+containername+volswr[i]+volsro[i]+" "+DOCKEREPO+"/docker-"+sourcecode+"&\n")
else:
dockername,langext = sourcecode.split(".")
print(DOCKEREXE+' run --name='+containername+volswr[i]+volsro[i]+" docker-"+dockername)
logging.debug(f"Generating Docker run command for {dockername}: {DOCKEREXE} run --name={containername+volswr[i]+volsro[i]} docker-{dockername}")
frun.write(DOCKEREXE+' run --name='+containername+volswr[i]+volsro[i]+" docker-"+dockername+"&\n")
#if langext != "m": #3/27/21
# print(DOCKEREXE+' run --name='+containername+volswr[i]+volsro[i]+" docker-"+dockername)
Expand Down Expand Up @@ -651,7 +650,7 @@
containername,sourcecode = nodes_dict[node].split(':')
if len(sourcecode)!=0:
if sourcecode.find(".")==-1:
print("cannot pull container "+sourcecode+" with control core type "+concoretype) #3/28/21
logging.error("cannot pull container "+sourcecode+" with control core type "+concoretype) #3/28/21
quit()
dockername,langext = sourcecode.split(".")
fbuild.write('mkdir '+containername+"\n")
Expand Down Expand Up @@ -696,7 +695,6 @@

#make directories equivalent to volumes
for edges in edges_dict:
#print("mkdir "+edges)
fbuild.write("mkdir "+edges+"\n")

#make links for out directories
Expand Down Expand Up @@ -741,7 +739,7 @@
if len(sourcecode)!=0:
dockername,langext = sourcecode.split(".")
if not (langext in ["py","m","sh","cpp","v"]): # 6/22/21
print("."+langext+" not supported (Yet)")
logging.error(f"Extension .{langext} is unsupported")
quit()
if concoretype=="windows":
if langext=="py":
Expand Down