Merge pull request #155 from sunya-ch/ci

remove keras dependency and separate base image

Author: rootfs

.github/workflows/docker-base-image.yml

@@ -8,6 +8,9 @@ on:
       - dockerfiles/requirements.txt
       - dockerfiles/Dockerfile.base
 
+env:
+  IMAGE_VERSION: '0.6'
+
 jobs:
   build:
 
@@ -18,7 +21,7 @@ jobs:
 
     - name: Build image
       run: |
-        docker build -t quay.io/sustainable_computing_io/kepler_model_server_base:latest dockerfiles -f dockerfiles/Dockerfile.base
+        docker build -t quay.io/sustainable_computing_io/kepler_model_server_base:v${{env.IMAGE_VERSION}} dockerfiles -f dockerfiles/Dockerfile.base
       
     - name: Login to Quay
       if: ${{ (github.repository_owner == 'sustainable-computing-io') && (github.ref == 'refs/heads/main') }}
@@ -30,4 +33,5 @@ jobs:
 
     - name: Push to quay
       if: ${{ (github.repository_owner == 'sustainable-computing-io') && (github.ref == 'refs/heads/main') }}
-      run: docker push quay.io/sustainable_computing_io/kepler_model_server_base:latest
+      run: |
+        docker push quay.io/sustainable_computing_io/kepler_model_server_base:v${{env.IMAGE_VERSION}}

dockerfiles/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 quay.io/sustainable_computing_io/kepler_model_server_base:latest
+FROM --platform=linux/amd64 quay.io/sustainable_computing_io/kepler_model_server_base:v0.6
 
 WORKDIR /usr/local
 

dockerfiles/Dockerfile.test

@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 quay.io/sustainable_computing_io/kepler_model_server_base:latest
+FROM --platform=linux/amd64 quay.io/sustainable_computing_io/kepler_model_server_base:v0.6
 
 WORKDIR /usr/local
 

dockerfiles/requirements.txt

@@ -1,6 +1,4 @@
 flask==2.1.2
-tensorflow==2.9.1
-keras==2.9.0
 protobuf==3.19.4
 pandas==1.4.4
 numpy==1.22.4

src/estimate/model/estimate_common.py

@@ -3,12 +3,12 @@
 
 cpu_info = cpuinfo.get_cpu_info()
 
-if 'flags' in cpu_info and 'avx' in cpu_info['flags']:
-    import keras
-    from keras import backend as K
-else:
-    print("AVX instructions are not available.")
-    keras_enabled = False
+# if 'flags' in cpu_info and 'avx' in cpu_info['flags']:
+#     import keras
+#     from keras import backend as K
+# else:
+#     print("AVX instructions are not available.")
+#     keras_enabled = False
 
 from sklearn.metrics import mean_squared_error, mean_absolute_error
 

src/estimate/model/model.py

@@ -14,12 +14,12 @@
 from prom_types import TIMESTAMP_COL, valid_container_query
 
 from scikit_model import ScikitModel
-from keras_model import KerasModel
+# from keras_model import KerasModel
 
 # model wrapper
 MODELCLASS = {
-    'scikit': ScikitModel,
-    'keras': KerasModel,
+    'scikit': ScikitModel
+    # 'keras': KerasModel,
 }
 
 def default_predicted_col_func(energy_component):

tests/e2e_test.sh

@@ -64,6 +64,7 @@ wait_for_keyword() {
         if grep -q "$keyword" <<< $(get_${component}_log); then
             return
         fi
+        kubectl get po -n kepler -oyaml
         sleep 2
     done
     echo "timeout ${num_iterations}s waiting for '${keyword}' from ${component} log"