Fixed from review

exasol · Dec 6, 2024 · eacd04b · eacd04b
1 parent 50e8afd
commit eacd04b
Show file tree

Hide file tree

Showing 41 changed files with 16 additions and 122 deletions.
diff --git a/aws-code-build/ci/buildspec.yaml b/aws-code-build/ci/buildspec.yaml
diff --git a/exaudfclient/base/exaudfclient.template.sh b/exaudfclient/base/exaudfclient.template.sh
@@ -5,4 +5,4 @@ echo "Changing to script directory  $SCRIPT_DIR"
 cd "$SCRIPT_DIR" || return 1
 export LIBEXAUDFLIB_PATH="$SCRIPT_DIR/base/libexaudflib_complete.so"
 export LIBPYEXADATAFRAME_DIR="$SCRIPT_DIR/base/python/python3"
-export LD_LIBRARY_PATH="/opt/conda/cuda-compat/:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="/opt/conda/cuda-compat/:$LD_LIBRARY_PATH" #Temporary hack for the Cuda ML flavor(s)
diff --git a/flavors/standard-Exasol-8-cuda-ml/flavor_base/flavor_base_deps/packages/conda_channels b/flavors/standard-Exasol-8-cuda-ml/flavor_base/flavor_base_deps/packages/conda_channels
diff --git a/flavors/standard-Exasol-8-cuda-ml/flavor_base/flavor_base_deps/packages/python3_pip_packages b/flavors/standard-Exasol-8-cuda-ml/flavor_base/flavor_base_deps/packages/python3_pip_packages
diff --git a/flavors/standard-Exasol-8-cuda-ml/flavor_customization/Dockerfile b/flavors/standard-Exasol-8-cuda-ml/flavor_customization/Dockerfile
diff --git a/flavors/standard-Exasol-8-cuda-ml/flavor_customization/packages/conda_packages b/flavors/standard-Exasol-8-cuda-ml/flavor_customization/packages/conda_packages
diff --git a/flavors/standard-Exasol-8-cuda-ml/flavor_customization/packages/python3_pip_packages b/flavors/standard-Exasol-8-cuda-ml/flavor_customization/packages/python3_pip_packages
diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/FLAVOR_DESCRIPTION.md b/flavors/template-Exasol-8-python-3.10-cuda-conda/FLAVOR_DESCRIPTION.md
@@ -4,6 +4,8 @@
 
 **Remarks:** The packages are grouped by there main usage and their type.
 
+- CondaDeps dependencies
+  - [Ubuntu packages](flavor_base/conda_deps/packages/apt_get_packages)
 - UDFclient dependencies
   - [Conda Packages](flavor_base/udfclient_deps/packages/conda_packages)
   - [Conda Channels](flavor_base/udfclient_deps/packages/conda_channels)

diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile
@@ -11,7 +11,6 @@ WORKDIR /exaudfclient/
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MAMBA_ROOT_PREFIX/lib/
 ENV CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/
 ENV C_INCLUDE_PATH=$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/
-# We need to build with optimize here, because the debug build fails to run with a runtime linking error regarding protobuf
 RUN ./build.sh --config no-tty -c dbg --config python --config test-binaries
 RUN cp -r -L bazel-bin/* /exaudf
 

diff --git a/...rd-Exasol-8-cuda-ml/FLAVOR_DESCRIPTION.md → ...st-Exasol-8-cuda-ml/FLAVOR_DESCRIPTION.md b/...rd-Exasol-8-cuda-ml/FLAVOR_DESCRIPTION.md → ...st-Exasol-8-cuda-ml/FLAVOR_DESCRIPTION.md
@@ -4,6 +4,8 @@
 
 **Remarks:** The packages are grouped by there main usage and their type.
 
+- CondaDeps dependencies
+  - [Ubuntu packages](flavor_base/conda_deps/packages/apt_get_packages)
 - UDFclient dependencies
   - [Conda Packages](flavor_base/udfclient_deps/packages/conda_packages)
   - [Conda Channels](flavor_base/udfclient_deps/packages/conda_channels)

diff --git a/...lavor_base/base_test_build_run/Dockerfile → ...lavor_base/base_test_build_run/Dockerfile b/...lavor_base/base_test_build_run/Dockerfile → ...lavor_base/base_test_build_run/Dockerfile
@@ -11,7 +11,6 @@ WORKDIR /exaudfclient/
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MAMBA_ROOT_PREFIX/lib/
 ENV CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/
 ENV C_INCLUDE_PATH=$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/
-# We need to build with optimize here, because the debug build fails to run with a runtime linking error regarding protobuf
 RUN ./build.sh --config no-tty -c dbg --config python --config test-binaries
 RUN cp -r -L bazel-bin/* /exaudf
 

diff --git a/...-ml/flavor_base/base_test_deps/Dockerfile → ...-ml/flavor_base/base_test_deps/Dockerfile b/...-ml/flavor_base/base_test_deps/Dockerfile → ...-ml/flavor_base/base_test_deps/Dockerfile
diff --git a/.../base_test_deps/packages/apt_get_packages → .../base_test_deps/packages/apt_get_packages b/.../base_test_deps/packages/apt_get_packages → .../base_test_deps/packages/apt_get_packages
diff --git a/...cuda-ml/flavor_base/build_deps/Dockerfile → ...cuda-ml/flavor_base/build_deps/Dockerfile b/...cuda-ml/flavor_base/build_deps/Dockerfile → ...cuda-ml/flavor_base/build_deps/Dockerfile
diff --git a/...r_base/build_deps/packages/conda_channels → ...r_base/build_deps/packages/conda_channels b/...r_base/build_deps/packages/conda_channels → ...r_base/build_deps/packages/conda_channels
diff --git a/...r_base/build_deps/packages/conda_packages → ...r_base/build_deps/packages/conda_packages b/...r_base/build_deps/packages/conda_packages → ...r_base/build_deps/packages/conda_packages
diff --git a/...-cuda-ml/flavor_base/build_run/Dockerfile → ...-cuda-ml/flavor_base/build_run/Dockerfile b/...-cuda-ml/flavor_base/build_run/Dockerfile → ...-cuda-ml/flavor_base/build_run/Dockerfile
diff --git a/...asol-8-cuda-ml/flavor_base/build_steps.py → ...asol-8-cuda-ml/flavor_base/build_steps.py b/...asol-8-cuda-ml/flavor_base/build_steps.py → ...asol-8-cuda-ml/flavor_base/build_steps.py
@@ -116,23 +116,13 @@ def get_path_in_flavor(self):
         return "flavor_base"
 
 
-class AnalyzeFlavorCustomization(DockerFlavorAnalyzeImageTask):
-
-    def get_build_step(self) -> str:
-        return "flavor_customization"
-
-    def requires_tasks(self):
-        return {"flavor_base_deps": AnalyzeFlavorBaseDeps}
-
-
 class AnalyzeFlavorTestBuildRun(DockerFlavorAnalyzeImageTask):
 
     def get_build_step(self) -> str:
         return "flavor_test_build_run"
 
     def requires_tasks(self):
-        return {"flavor_customization": AnalyzeFlavorCustomization,
-                "base_test_build_run": AnalyzeBaseTestBuildRun}
+        return {"base_test_build_run": AnalyzeBaseTestBuildRun}
 
     def get_path_in_flavor(self):
         return "flavor_base"
@@ -143,8 +133,7 @@ def get_build_step(self) -> str:
         return "release"
 
     def requires_tasks(self):
-        return {"flavor_customization": AnalyzeFlavorCustomization,
-                "build_run": AnalyzeBuildRun,
+        return {"build_run": AnalyzeBuildRun,
                 "language_deps": AnalyzeLanguageDeps}
 
     def get_path_in_flavor(self):

diff --git a/...cuda-ml/flavor_base/conda_deps/Dockerfile → ...cuda-ml/flavor_base/conda_deps/Dockerfile b/...cuda-ml/flavor_base/conda_deps/Dockerfile → ...cuda-ml/flavor_base/conda_deps/Dockerfile
diff --git a/..._base/conda_deps/_activate_current_env.sh → ..._base/conda_deps/_activate_current_env.sh b/..._base/conda_deps/_activate_current_env.sh → ..._base/conda_deps/_activate_current_env.sh
diff --git a/...base/conda_deps/packages/apt_get_packages → ...base/conda_deps/packages/apt_get_packages b/...base/conda_deps/packages/apt_get_packages → ...base/conda_deps/packages/apt_get_packages
diff --git a/...Exasol-8-cuda-ml/flavor_base/derived_from → ...Exasol-8-cuda-ml/flavor_base/derived_from b/...Exasol-8-cuda-ml/flavor_base/derived_from → ...Exasol-8-cuda-ml/flavor_base/derived_from
diff --git a/...l/flavor_base/flavor_base_deps/Dockerfile → ...l/flavor_base/flavor_base_deps/Dockerfile b/...l/flavor_base/flavor_base_deps/Dockerfile → ...l/flavor_base/flavor_base_deps/Dockerfile
diff --git a/...vor_customization/packages/conda_channels → .../flavor_base_deps/packages/conda_channels b/...vor_customization/packages/conda_channels → .../flavor_base_deps/packages/conda_channels
@@ -1 +1,2 @@
 conda-forge
+nvidia
diff --git a/.../flavor_base_deps/packages/conda_packages → .../flavor_base_deps/packages/conda_packages b/.../flavor_base_deps/packages/conda_packages → .../flavor_base_deps/packages/conda_packages
diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/flavor_base_deps/packages/python3_pip_packages b/flavors/test-Exasol-8-cuda-ml/flavor_base/flavor_base_deps/packages/python3_pip_packages
diff --git a/...vor_base/flavor_test_build_run/Dockerfile → ...vor_base/flavor_test_build_run/Dockerfile b/...vor_base/flavor_test_build_run/Dockerfile → ...vor_base/flavor_test_build_run/Dockerfile
diff --git a/...8-cuda-ml/flavor_base/language_definition → ...8-cuda-ml/flavor_base/language_definition b/...8-cuda-ml/flavor_base/language_definition → ...8-cuda-ml/flavor_base/language_definition
diff --git a/...a-ml/flavor_base/language_deps/Dockerfile → ...a-ml/flavor_base/language_deps/Dockerfile b/...a-ml/flavor_base/language_deps/Dockerfile → ...a-ml/flavor_base/language_deps/Dockerfile
diff --git a/...ase/language_deps/packages/conda_channels → ...ase/language_deps/packages/conda_channels b/...ase/language_deps/packages/conda_channels → ...ase/language_deps/packages/conda_channels
diff --git a/...ase/language_deps/packages/conda_packages → ...ase/language_deps/packages/conda_packages b/...ase/language_deps/packages/conda_packages → ...ase/language_deps/packages/conda_packages
diff --git a/...-8-cuda-ml/flavor_base/release/Dockerfile → ...-8-cuda-ml/flavor_base/release/Dockerfile b/...-8-cuda-ml/flavor_base/release/Dockerfile → ...-8-cuda-ml/flavor_base/release/Dockerfile
diff --git a/...ml/flavor_base/security_scan/.trivyignore → ...ml/flavor_base/security_scan/.trivyignore b/...ml/flavor_base/security_scan/.trivyignore → ...ml/flavor_base/security_scan/.trivyignore
diff --git a/...a-ml/flavor_base/security_scan/Dockerfile → ...a-ml/flavor_base/security_scan/Dockerfile b/...a-ml/flavor_base/security_scan/Dockerfile → ...a-ml/flavor_base/security_scan/Dockerfile
diff --git a/...e/security_scan/packages/apt_get_packages → ...e/security_scan/packages/apt_get_packages b/...e/security_scan/packages/apt_get_packages → ...e/security_scan/packages/apt_get_packages
diff --git a/...scan/packages/apt_get_packages_trivy_deps → ...scan/packages/apt_get_packages_trivy_deps b/...scan/packages/apt_get_packages_trivy_deps → ...scan/packages/apt_get_packages_trivy_deps
diff --git a/...a-ml/flavor_base/security_scan/trivy.rego → ...a-ml/flavor_base/security_scan/trivy.rego b/...a-ml/flavor_base/security_scan/trivy.rego → ...a-ml/flavor_base/security_scan/trivy.rego
@@ -6,5 +6,5 @@ default ignore = false
 
 ignore {
         input.PkgName == "linux-libc-dev"
-        regex.match("^kernel:", input.Title)
+        regex.match("^(kernel:|In the Linux kernel)", input.Title)
 }
diff --git a/...d-Exasol-8-cuda-ml/flavor_base/testconfig → ...t-Exasol-8-cuda-ml/flavor_base/testconfig b/...d-Exasol-8-cuda-ml/flavor_base/testconfig → ...t-Exasol-8-cuda-ml/flavor_base/testconfig
diff --git a/...-ml/flavor_base/udfclient_deps/Dockerfile → ...-ml/flavor_base/udfclient_deps/Dockerfile b/...-ml/flavor_base/udfclient_deps/Dockerfile → ...-ml/flavor_base/udfclient_deps/Dockerfile
diff --git a/...se/udfclient_deps/packages/conda_channels → ...se/udfclient_deps/packages/conda_channels b/...se/udfclient_deps/packages/conda_channels → ...se/udfclient_deps/packages/conda_channels
diff --git a/...se/udfclient_deps/packages/conda_packages → ...se/udfclient_deps/packages/conda_packages b/...se/udfclient_deps/packages/conda_packages → ...se/udfclient_deps/packages/conda_packages