[smith-waterman] Support Intel OFS IA-420F/R0 and OFS IA-840F/R0 FPGA…

… platforms
inaccel · Feb 8, 2024 · c49e4e2 · c49e4e2
1 parent 2ec7d67
commit c49e4e2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/charts/smith-waterman/Chart.yaml b/charts/smith-waterman/Chart.yaml
@@ -31,4 +31,4 @@ sources:
 - https://docs.inaccel.com
 - https://github.com/inaccel/marketplace
 type: application
-version: 1.1.3
+version: 1.1.4
diff --git a/charts/smith-waterman/container/Dockerfile b/charts/smith-waterman/container/Dockerfile
@@ -17,7 +17,8 @@ RUN apt update \
  && rm --force --recursive /var/lib/apt/lists/*
 
 RUN pip install --no-cache-dir \
-        gradio
+        gradio==3.20.* \
+        pydantic==1.*
 
 RUN curl -sS https://setup.inaccel.com/repository | sh \
  && apt install --yes coral-api \

diff --git a/charts/smith-waterman/questions.yaml b/charts/smith-waterman/questions.yaml
@@ -78,6 +78,8 @@ questions:
 - group: Platform
   label: ' '
   options:
+  - Intel OFS IA-420F/R0 (06dd1e32478657c38c353dc048cdb7e0)
+  - Intel OFS IA-840F/R0 (18f573d96298516d891fc9b6261e3a73)
   - Intel PAC A10 (38d782e3b6125343b9342433e348ac4c)
   - Intel PAC S10 (9346116da52d5ca8b06aa9a389ef7c8d)
   required: true

diff --git a/charts/smith-waterman/templates/_platform.tpl b/charts/smith-waterman/templates/_platform.tpl
@@ -1,13 +1,13 @@
 {{/* vim: set filetype=mustache: */}}
 
 {{- define "platformName" -}}
-{{- regexReplaceAll "^([^ ]+)[ /](.*)[ /]([^ ]+)$" $.Values.platform "${2}" | snakecase -}}
+{{- regexReplaceAll "^([^ /]+)[ /](.*)[ /]([^ /]+)$" $.Values.platform "${2}" | lower | replace " " "_" | replace "-" "" | replace "/" "" -}}
 {{- end -}}
 
 {{- define "platformVendor" -}}
-{{- regexReplaceAll "^([^ ]+)[ /](.*)[ /]([^ ]+)$" $.Values.platform "${1}" | lower -}}
+{{- regexReplaceAll "^([^ /]+)[ /](.*)[ /]([^ /]+)$" $.Values.platform "${1}" | lower -}}
 {{- end -}}
 
 {{- define "platformVersion" -}}
-{{- regexReplaceAll "^([^ ]+)[ /](.*)[ /]([^ ]+)$" $.Values.platform "${3}" | trimAll "()" -}}
+{{- regexReplaceAll "^([^ /]+)[ /](.*)[ /]([^ /]+)$" $.Values.platform "${3}" | trimAll "()" -}}
 {{- end -}}
diff --git a/charts/smith-waterman/values.yaml b/charts/smith-waterman/values.yaml
@@ -8,6 +8,8 @@ autoscaling:
   # scaleToZeroPodRetentionPeriod: ...
   # target: ...
 bitstreams:
+  intel/ofs_ia420fr0/06dd1e32478657c38c353dc048cdb7e0: com/inaccel/klib/sw/2.0/1align
+  intel/ofs_ia840fr0/18f573d96298516d891fc9b6261e3a73: com/inaccel/klib/sw/2.0/1align
   intel/pac_a10/38d782e3b6125343b9342433e348ac4c: com/inaccel/klib/sw/2.0/1align
   intel/pac_s10/9346116da52d5ca8b06aa9a389ef7c8d: com/inaccel/klib/sw/2.0/1align
 # cpu: ...