Skip to content
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.

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

224.fre make compile test #295

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ fre/tests/test_files/outdirfre/
fre/pp/tests/configure_yaml_out/
fre/yamltools/tests/combine_yamls_out/
fre/app/generate_time_averages/tests/time_avg_test_files/
fre/make/tests/null_example/combined-null_model.yaml
fre/make/tests/makefile_out
fre/make/tests/compile_out
fre/tests/fremake_out

# Translations
*.mo
Expand Down
2 changes: 1 addition & 1 deletion fre/gfdl_msd_schemas
8 changes: 4 additions & 4 deletions fre/make/create_compile_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ def compile_create(yamlfile,platform,target,jobs,parallel,execute,verbose):
name = yamlfile.split(".")[0]
nparallel = parallel
jobs = str(jobs)
run = execute

if verbose:
logging.basicCOnfig(level=logging.INFO)
Expand Down Expand Up @@ -79,13 +78,14 @@ def compile_create(yamlfile,platform,target,jobs,parallel,execute,verbose):
fremakeBuild.writeBuildComponents(c)
fremakeBuild.writeScript()
fremakeBuildList.append(fremakeBuild)
click.echo("\nCompile script created at " + bldDir + "/compile.sh" + "\n")
if run:

if execute:
click.echo("\nCompile script created at " + bldDir + "/compile.sh" + "\n")
if baremetalRun:
pool = Pool(processes=nparallel) # Create a multiprocessing Pool
pool.map(buildBaremetal.fremake_parallel,fremakeBuildList) # process data_inputs iterable with pool
else:
sys.exit()
click.echo("\nCompile script created at " + bldDir + "/compile.sh" + "\n")

@click.command()
def _compile_create(yamlfile,platform,target,jobs,parallel,execute,verbose):
Expand Down
1 change: 0 additions & 1 deletion fre/make/gfdlfremake/platformfre.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ def __init__(self,platforminfo):
raise Exception("You must specify the program used to build the container (containerBuild) on the "+p["name"]+" platform in the file "+fname+"\n")
if p["containerBuild"] != "podman" and p["containerBuild"] != "docker":
raise ValueError("Container builds only supported with docker or podman, but you listed "+p["containerBuild"]+"\n")
print (p["containerBuild"])
## Check for container environment set up for RUN commands
try:
p["containerBase"]
Expand Down
1 change: 0 additions & 1 deletion fre/make/gfdlfremake/yamlfre.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ def __init__(self,combinedyaml,v):

#get platform info
self.platformsdict = self.freyaml.get("platforms")
print(self.platformsdict)
self.platforms = platformfre.platforms(self.platformsdict)
self.platformsyaml = self.platforms.getPlatformsYaml()

Expand Down
104 changes: 0 additions & 104 deletions fre/make/tests/AM5_example/am5.yaml

This file was deleted.

67 changes: 0 additions & 67 deletions fre/make/tests/AM5_example/compile.yaml

This file was deleted.

28 changes: 0 additions & 28 deletions fre/make/tests/AM5_example/yaml_include/platforms.yaml

This file was deleted.

88 changes: 0 additions & 88 deletions fre/make/tests/AM5_example/yaml_include/pp.c96_amip.yaml

This file was deleted.

Loading
Loading