Use inputs in raw containers example (flyteorg#918)

Signed-off-by: Eduardo Apolinario <[email protected]> Signed-off-by: Eduardo Apolinario <[email protected]> Co-authored-by: Eduardo Apolinario <[email protected]>
eapolinario · Nov 4, 2022 · 9b7d065 · 9b7d065
1 parent ad5d53a
commit 9b7d065
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 55 deletions.
diff --git a/...nerization/raw-containers-supporting-files/per-language/haskell/calculate-ellipse-area.hs b/...nerization/raw-containers-supporting-files/per-language/haskell/calculate-ellipse-area.hs
@@ -8,14 +8,12 @@ calculateEllipseArea a b = pi * a * b
 
 main = do
   args <- getArgs
-  let input_a = args!!0 ++ "/a"
-      input_b = args!!0 ++ "/b"
-  a <- readFile input_a
-  b <- readFile input_b
+  let a = args!!0
+      b = args!!1
 
   let area = calculateEllipseArea (read a::Float) (read b::Float)
 
-  let output_area = args!!1 ++ "/area"
-      output_metadata = args!!1 ++ "/metadata"
+  let output_area = args!!2 ++ "/area"
+      output_metadata = args!!2 ++ "/metadata"
   writeFile output_area (show area)
   writeFile output_metadata "[from haskell rawcontainer]"
diff --git a/...ainerization/raw-containers-supporting-files/per-language/julia/calculate-ellipse-area.jl b/...ainerization/raw-containers-supporting-files/per-language/julia/calculate-ellipse-area.jl
@@ -5,22 +5,16 @@ function calculate_area(a, b)
     π * a * b
 end
 
-function read_input(input_dir, v)
-    open(@sprintf "%s/%s" input_dir v) do file
-        parse.(Float64, read(file, String))
-    end
-end
-
 function write_output(output_dir, output_file, v)
     output_path = @sprintf "%s/%s" output_dir output_file
     open(output_path, "w") do file
         write(file, string(v))
     end
 end
 
-function main(input_dir, output_dir)
-    a = read_input(input_dir, 'a')
-    b = read_input(input_dir, 'b')
+function main(a, b, output_dir)
+    a = parse.(Float64, a)
+    b = parse.(Float64, b)
 
     area = calculate_area(a, b)
 
@@ -30,7 +24,8 @@ end
 
 # the keyword ARGS is a special value that contains the command-line arguments
 # julia arrays are 1-indexed
-input_dir = ARGS[1]
-output_dir = ARGS[2]
+a = ARGS[1]
+b = ARGS[2]
+output_dir = ARGS[3]
 
-main(input_dir, output_dir)
+main(a, b, output_dir)
diff --git a/...inerization/raw-containers-supporting-files/per-language/python/calculate-ellipse-area.py b/...inerization/raw-containers-supporting-files/per-language/python/calculate-ellipse-area.py
@@ -2,11 +2,6 @@
 import sys
 
 
-def read_input(input_dir, v):
-    with open(f"{input_dir}/{v}", "r") as f:
-        return float(f.read())
-
-
 def write_output(output_dir, output_file, v):
     with open(f"{output_dir}/{output_file}", "w") as f:
         f.write(str(v))
@@ -16,9 +11,9 @@ def calculate_area(a, b):
     return math.pi * a * b
 
 
-def main(input_dir, output_dir):
-    a = read_input(input_dir, "a")
-    b = read_input(input_dir, "b")
+def main(a, b, output_dir):
+    a = float(a)
+    b = float(b)
 
     area = calculate_area(a, b)
 
@@ -27,7 +22,8 @@ def main(input_dir, output_dir):
 
 
 if __name__ == "__main__":
-    input_dir = sys.argv[1]
-    output_dir = sys.argv[2]
+    a = sys.argv[1]
+    b = sys.argv[2]
+    output_dir = sys.argv[3]
 
-    main(input_dir, output_dir)
+    main(a, b, output_dir)
diff --git a/cookbook/core/containerization/raw-containers-supporting-files/per-language/r/Dockerfile b/cookbook/core/containerization/raw-containers-supporting-files/per-language/r/Dockerfile
@@ -3,8 +3,3 @@ FROM r-base
 WORKDIR /root
 
 COPY *.R /root/
-
-# Not sure whether this a horrible hack. I couldn't
-# find a better way to install a package via command
-# line
-RUN Rscript --save install-readr.R
diff --git a/.../containerization/raw-containers-supporting-files/per-language/r/calculate-ellipse-area.R b/.../containerization/raw-containers-supporting-files/per-language/r/calculate-ellipse-area.R
@@ -1,12 +1,10 @@
-library(readr)
+#!/usr/bin/env Rscript
 
 args = commandArgs(trailingOnly=TRUE)
 
-input_dir = args[1]
-output_dir = args[2]
-
-a = read_lines(sprintf("%s/%s", input_dir, 'a'))
-b = read_lines(sprintf("%s/%s", input_dir, 'b'))
+a = args[1]
+b = args[2]
+output_dir = args[3]
 
 area <- pi * as.double(a) * as.double(b)
 print(area)

diff --git a/...ainerization/raw-containers-supporting-files/per-language/shell/calculate-ellipse-area.sh b/...ainerization/raw-containers-supporting-files/per-language/shell/calculate-ellipse-area.sh
@@ -1,8 +1,5 @@
 #! /usr/bin/env sh
 
-a=$(cat $1/a)
-b=$(cat $1/b)
+echo "4*a(1) * $1 * $2" | bc -l | tee $3/area
 
-echo "4*a(1) * $a * $b" | bc -l | tee $2/area
-
-echo "[from shell rawcontainer]" | tee $2/metadata
+echo "[from shell rawcontainer]" | tee $3/metadata
diff --git a/cookbook/core/containerization/raw_container.py b/cookbook/core/containerization/raw_container.py
@@ -35,10 +35,11 @@
     output_data_dir="/var/outputs",
     inputs=kwtypes(a=float, b=float),
     outputs=kwtypes(area=float, metadata=str),
-    image="ghcr.io/flyteorg/rawcontainers-shell:v1",
+    image="ghcr.io/flyteorg/rawcontainers-shell:v2",
     command=[
         "./calculate-ellipse-area.sh",
-        "/var/inputs",
+        "{{.inputs.a}}",
+        "{{.inputs.b}}",
         "/var/outputs",
     ],
 )
@@ -49,11 +50,12 @@
     output_data_dir="/var/outputs",
     inputs=kwtypes(a=float, b=float),
     outputs=kwtypes(area=float, metadata=str),
-    image="ghcr.io/flyteorg/rawcontainers-python:v1",
+    image="ghcr.io/flyteorg/rawcontainers-python:v2",
     command=[
         "python",
         "calculate-ellipse-area.py",
-        "/var/inputs",
+        "{{.inputs.a}}",
+        "{{.inputs.b}}",
         "/var/outputs",
     ],
 )
@@ -64,12 +66,13 @@
     output_data_dir="/var/outputs",
     inputs=kwtypes(a=float, b=float),
     outputs=kwtypes(area=float, metadata=str),
-    image="ghcr.io/flyteorg/rawcontainers-r:v1",
+    image="ghcr.io/flyteorg/rawcontainers-r:v2",
     command=[
         "Rscript",
         "--vanilla",
         "calculate-ellipse-area.R",
-        "/var/inputs",
+        "{{.inputs.a}}",
+        "{{.inputs.b}}",
         "/var/outputs",
     ],
 )
@@ -80,10 +83,11 @@
     output_data_dir="/var/outputs",
     inputs=kwtypes(a=float, b=float),
     outputs=kwtypes(area=float, metadata=str),
-    image="ghcr.io/flyteorg/rawcontainers-haskell:v1",
+    image="ghcr.io/flyteorg/rawcontainers-haskell:v2",
     command=[
         "./calculate-ellipse-area",
-        "/var/inputs",
+        "{{.inputs.a}}",
+        "{{.inputs.b}}",
         "/var/outputs",
     ],
 )
@@ -94,11 +98,12 @@
     output_data_dir="/var/outputs",
     inputs=kwtypes(a=float, b=float),
     outputs=kwtypes(area=float, metadata=str),
-    image="ghcr.io/flyteorg/rawcontainers-julia:v1",
+    image="ghcr.io/flyteorg/rawcontainers-julia:v2",
     command=[
         "julia",
         "calculate-ellipse-area.jl",
-        "/var/inputs",
+        "{{.inputs.a}}",
+        "{{.inputs.b}}",
         "/var/outputs",
     ],
 )