From 036d0b46363337944623ca318d3ea44959a77082 Mon Sep 17 00:00:00 2001 From: Eli Fajardo Date: Mon, 28 Oct 2024 14:30:29 -0400 Subject: [PATCH] Fix missing dependency in DFP Grafana example (#1977) - Dependencies for DFP container were recently moved from `examples/digital_fingerprinting/production/conda_env.yaml` to `conda/environments/examples_cuda-125_arch-x86_64.yaml` but `python-logging-loki` was not included. - Add `python-logging-loki` to `example-dfp-prod` in `dependencies.yaml`. - Remove `conda_env.yaml` since it's no longer being used anywhere. Closes #1917 ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes. Authors: - Eli Fajardo (https://github.com/efajardo-nv) - David Gardner (https://github.com/dagardner-nv) Approvers: - David Gardner (https://github.com/dagardner-nv) - Anuradha Karuppiah (https://github.com/AnuradhaKaruppiah) URL: https://github.com/nv-morpheus/Morpheus/pull/1977 --- .../all_cuda-125_arch-x86_64.yaml | 1 + .../examples_cuda-125_arch-x86_64.yaml | 1 + dependencies.yaml | 3 ++ .../production/conda_env.yml | 37 ------------------- 4 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 examples/digital_fingerprinting/production/conda_env.yml diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index ac9b3c0d84..610f232304 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -139,6 +139,7 @@ dependencies: - nemollm==0.3.5 - pymilvus==2.3.6 - pytest-kafka==0.6.0 + - python-logging-loki - sentence-transformers==2.7 - torch==2.4.0+cu124 name: all_cuda-125_arch-x86_64 diff --git a/conda/environments/examples_cuda-125_arch-x86_64.yaml b/conda/environments/examples_cuda-125_arch-x86_64.yaml index 5e9b725d6f..11a44d738d 100644 --- a/conda/environments/examples_cuda-125_arch-x86_64.yaml +++ b/conda/environments/examples_cuda-125_arch-x86_64.yaml @@ -77,6 +77,7 @@ dependencies: - milvus==2.3.5 - nemollm==0.3.5 - pymilvus==2.3.6 + - python-logging-loki - sentence-transformers==2.7 - torch==2.4.0+cu124 name: examples_cuda-125_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index b34f1996c2..f5808cdf4f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -433,6 +433,9 @@ dependencies: - kfp - papermill=2.4.0 - s3fs + - pip + - pip: + - python-logging-loki example-gnn: common: diff --git a/examples/digital_fingerprinting/production/conda_env.yml b/examples/digital_fingerprinting/production/conda_env.yml deleted file mode 100644 index 0eb8d3b2db..0000000000 --- a/examples/digital_fingerprinting/production/conda_env.yml +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -name: morpheus -channels: - - rapidsai - - nvidia - - nvidia/label/dev # For pre-releases of MRC. Should still default to full releases if available - - conda-forge -dependencies: - ####### Morpheus Dependencies (keep sorted!) ####### - - boto3 - - dask - - dill - - distributed - - kfp - - librdkafka - - mlflow>=2.10.0,<3 - - nodejs=18.* - - papermill - - s3fs>=2023.6 - - ##### Pip Dependencies (keep sorted!) ####### - - pip: - - python-logging-loki