From e7a39e43b40b2aafd0dbb20b50011fa00bc57a41 Mon Sep 17 00:00:00 2001
From: Gregor von Laszewski <laszewski@gmail.com>
Date: Thu, 5 Oct 2023 08:06:53 -0400
Subject: [PATCH] integrate cloudmesh ee in cloudmask 0.5

---
 .../cloudmask/target/greene_v0.5/Makefile     | 21 ++++++++++++-------
 .../greene_v0.5/config-simple-rivanna.yaml    |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/benchmarks/cloudmask/target/greene_v0.5/Makefile b/benchmarks/cloudmask/target/greene_v0.5/Makefile
index 6e48cb38..c60de79a 100644
--- a/benchmarks/cloudmask/target/greene_v0.5/Makefile
+++ b/benchmarks/cloudmask/target/greene_v0.5/Makefile
@@ -2,8 +2,9 @@ SHELL := /bin/bash
 AWS_S3=aws s3 --no-sign-request --endpoint-url https://s3.echo.stfc.ac.uk
 NAME=cloudmask
 VENV=/scratch/$(USER)/ENV3
+PRG=cloudmask_v0.5.py
 
-.PHONY: data clean project localscratch singularity stop singularity.json
+.PHONY: project data clean project localscratch singularity stop singularity.json
 
 all: project localscratch shm generate
 
@@ -28,7 +29,11 @@ data:
 data-rivanna:
 	time cp -rv /project/bii_dsc_community/mlcommons/data/cloudmask/* $(PROJECT_DATA)
 
-project: project.json generate
+project: clean-project project.json generate
+
+clean-project:
+	rm -rf project
+	rm -f project.json jobs-project.sh
 
 generate: jobs-project.sh 
 
@@ -40,19 +45,19 @@ submit:
 localscratch: localscratch.json
 
 jobs-%.sh: %.json
-	cms sbatch generate submit --name=$<  > $@
+	cms ee generate submit --job_type=sbatch --name=$<  > $@
 
-%.json: config.in.yaml
+%.json: config.in.yaml cloudmask_v0.5.in.slurm
 	source ${VENV}/bin/activate ; \
-	cms sbatch generate \
-	           --source=slurm.in.sh \
+	cms ee generate \
+	           --source=cloudmask_v0.5.in.slurm \
 	           --config=$< \
 	           --name=$(basename $@) \
 	           --noos \
-	           --os=USER \
+	           --os=USER,HOME \
 	           --output_dir=./$(basename $@) \
                --source_dir=. \
-               --copycode=slstr_cloud.py \
+               --copycode="${PRG},data_loader.py,model.py" \
                --verbose
 
 kill: stop
diff --git a/benchmarks/cloudmask/target/greene_v0.5/config-simple-rivanna.yaml b/benchmarks/cloudmask/target/greene_v0.5/config-simple-rivanna.yaml
index e15d49df..7684168e 100644
--- a/benchmarks/cloudmask/target/greene_v0.5/config-simple-rivanna.yaml
+++ b/benchmarks/cloudmask/target/greene_v0.5/config-simple-rivanna.yaml
@@ -11,11 +11,11 @@
 
 name: cloudmask-greene
 
-
 sbatch:
   mode: h
   dir: localscratch
 
+
 run:
   venvpath: "/scratch/{os.USER}/ENV3"
   datadir: "/scratch/{os.USER}/data"