Merge branch 'master' of github.com:amygdala/code-snippets

Author: amygdala

ml/kubeflow-pipelines/components/dataflow/tfma/tfma_expers.ipynb

@@ -30,7 +30,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "OUTPUT_PATH_PREFIX = 'gs://gs://<YOUR_BUCKET_PATH>/<WORKFLOW_NAME>/'"
+    "OUTPUT_PATH_PREFIX = 'gs://<YOUR_BUCKET_PATH>/<WORKFLOW_NAME>/'"
    ]
   },
   {
@@ -130,16 +130,6 @@
     "tfma.view.render_slicing_metrics(tfma_result2)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Show overall metrics.\n",
-    "tfma.view.render_slicing_metrics(tfma_result3)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,

ml/kubeflow-pipelines/samples/kubeflow-tf/README.md

@@ -78,6 +78,5 @@ argo submit workflow2.yaml \
      -p workers=2 \
      -p pss=1 \
      -p preprocessing-module=gs://aju-dev-demos-codelabs/KF/taxi-preproc/preprocessing.py \
-     -p old-eval-model-dir="gs://aju-dev-demos-codelabs/KF/prev/eval_model_dir" \
      --entrypoint preproc-train-analyze-deploy
 ```

ml/kubeflow-pipelines/samples/kubeflow-tf/workflow2.py

@@ -40,7 +40,6 @@ def workflow2(
   ts2_2: dsl.PipelineParam=dsl.PipelineParam(name='ts2-2', value='2016-03-01 00:00:00'),
   preprocessing_module: dsl.PipelineParam=dsl.PipelineParam(name='preprocessing-module1', value='gs://aju-dev-demos-codelabs/KF/taxi-preproc/preprocessing.py'),
   preprocess_mode: dsl.PipelineParam=dsl.PipelineParam(name='preprocess-mode', value='local'),
-  old_eval_model_dir: dsl.PipelineParam=dsl.PipelineParam(name='old-eval-model-dir', value='gs://aju-dev-demos-codelabs/KF/prev/eval_model_dir'),
   tfma_mode: dsl.PipelineParam=dsl.PipelineParam(name='tfma-mode', value='local')):
 
 
@@ -157,17 +156,6 @@ def workflow2(
           "--setup_file", tfma_setup_file,
           "--project", project]
       )
-  analyze3 = dsl.ContainerOp(
-      name = 'analyze3',
-      image = 'gcr.io/google-samples/ml-pipeline-dataflow-tfma-taxi',
-      arguments = ["--input_csv", '%s/%s/tft-eval/eval.csv-00000-of-00001' % (working_dir, '{{workflow.name}}'),
-          "--tfma_run_dir", '%s/%s/tfma3/output' % (working_dir, '{{workflow.name}}'),
-          "--eval_model_dir", old_eval_model_dir,
-          "--mode", tfma_mode,
-          "--setup_file", tfma_setup_file,
-          "--project", project]
-      )
-
   cmleop = dsl.ContainerOp(
       name = 'cmleop',
       image = 'gcr.io/google-samples/ml-pipeline-cmle-op',
@@ -188,7 +176,6 @@ def workflow2(
   analyze.after(tfteval)
   analyze2.after(tfteval)
   analyze2.after(train2)
-  analyze3.after(tfteval)
   cmleop.after(train)
   cmleop2.after(train2)
 

ml/kubeflow-pipelines/samples/kubeflow-tf/workflow2.yaml

@@ -34,7 +34,6 @@ spec:
       - name: ts2-1
       - name: ts1-2
       - name: ts2-2
-      - name: old-eval-model-dir
   templates:
   - name: preproc-train-analyze-deploy
     inputs:
@@ -58,7 +57,6 @@ spec:
       - name: ts2-1
       - name: ts1-2
       - name: ts2-2
-      - name: old-eval-model-dir
     dag:
       tasks:
       - name: preprocesseval
@@ -253,23 +251,6 @@ spec:
             value: "{{inputs.parameters.project}}"
           - name: setup-file
             value: "{{inputs.parameters.tfma-setup-file}}"
-      - name: analyze3
-        dependencies: [preprocesseval]
-        template: analyze
-        arguments:
-          parameters:
-          - name: input-csv
-            value: "{{inputs.parameters.working-dir}}/{{workflow.name}}/tft-eval/eval.csv-00000-of-00001"
-          - name: tfma-run-dir
-            value: "{{inputs.parameters.working-dir}}/{{workflow.name}}/tfma3/output"
-          - name: eval-model-dir
-            value: "{{inputs.parameters.old-eval-model-dir}}"
-          - name: tfma-mode
-            value: "{{inputs.parameters.tfma-mode}}"
-          - name: project
-            value: "{{inputs.parameters.project}}"
-          - name: setup-file
-            value: "{{inputs.parameters.tfma-setup-file}}"
       - name: cmle-op
         dependencies: [train]
         template: cmleop