linting, add onnx networks to create.py, change default cmssw version

cmssw/install_sandbox_tfaot.sh

@@ -18,9 +18,6 @@ action() {
     # define additional model variables
     local tool_name="tfaot-model-mlprof-test"
 
-    # temporarily prepend the local cms_tfaot path
-    export PYTHONPATH="${MLP_BASE}/modules/cms-tfaot:${PYTHONPATH}"
-
     # remove existing code
     rm -rf MLProf
 

examples/simple_dnn/create.py

@@ -3,11 +3,14 @@
 """
 Test script to create a simple DNN model.
 Best to be executed in a CMSSW environment with TensorFlow and cmsml installed.
+Will install tf2onnx for the user if not present in environment.
 
 Signature: f32(64) -> f32(8)
 """
 
 import os
+import subprocess
+import importlib.util
 
 import cmsml
 
@@ -63,6 +66,21 @@ def create_model(
         os.path.join(model_dir, f"saved_model_{_postfix}"),
     )
 
+    # convert SavedModel to onnx
+    # install tf2onnx if necessary
+    if importlib.util.find_spec("tf2onnx") is None:
+        subprocess.run("pip3 install --user tf2onnx", shell=True)
+
+    # convert
+    subprocess.run(
+        f"""
+            python3 -m tf2onnx.convert \
+            --saved-model saved_model_{_postfix} \
+            --output onnx_graph_{_postfix}.onnx \
+        """,
+        shell=True,
+    )
+
 
 def main():
     this_dir = os.path.dirname(os.path.abspath(__file__))

mlprof/scripts/render_aot.py

@@ -63,11 +63,11 @@ def render_aot(plugin_file: str, header_file: str, model_name: str) -> None:
     ]
     # untied inference
     content["untied_inference"] = [
-        f"model_.run<{', '.join(output_arrays)}>(batchSize_, {', '.join(input_names)});"
+        f"model_.run<{', '.join(output_arrays)}>(batchSize_, {', '.join(input_names)});",
     ]
     # tied inference
     content["tied_inference"] = [
-        f"std::tie({', '.join(output_names)}) = {content['untied_inference'][0]};"
+        f"std::tie({', '.join(output_names)}) = {content['untied_inference'][0]};",
     ]
 
     # read the plugin file content

mlprof/tasks/parameters.py

@@ -70,8 +70,8 @@ class CMSSWParameters(BaseTask):
     """
 
     cmssw_version = luigi.Parameter(
-        default="CMSSW_14_1_X_2024-04-04-2300",
-        description="CMSSW version; default: CMSSW_14_1_X_2024-04-04-2300",
+        default="CMSSW_14_1_X_2024-04-15-2300",
+        description="CMSSW version; default: CMSSW_14_1_X_2024-04-15-2300",
     )
     scram_arch = luigi.Parameter(
         default="slc7_amd64_gcc12",