Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Guard optional dependencies in try/except blocks #1382

Merged
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
be39cb6
First pass at updating meta.yaml, untested
dagardner-nv Nov 22, 2023
ace5059
For now exclude the pip only deps
dagardner-nv Nov 22, 2023
48fda28
Specify pip only dependencies
dagardner-nv Nov 22, 2023
d5e29cf
Move pip only deps to runtime.yml
dagardner-nv Nov 22, 2023
07fd159
Add transitive dep for py4j which is needed by databricks-connect
dagardner-nv Nov 22, 2023
40205c7
Add missing milvus mark
dagardner-nv Nov 22, 2023
3388ee3
Remove packages which are only used by a single stage/node as these m…
dagardner-nv Nov 23, 2023
7a7e363
Import optional dependencies in a try/except block, and only raise wh…
dagardner-nv Nov 23, 2023
34b5c2f
Import optional deps in a try/except block
dagardner-nv Nov 23, 2023
69b1716
Merge branch 'david-missing-milvus-mark' into david-conda-deps-1380-p2
dagardner-nv Nov 23, 2023
e628c36
Fix dependency check
dagardner-nv Nov 23, 2023
7ec5ac7
Ensure optional deps are quoted if they appear in type annotations, m…
dagardner-nv Nov 27, 2023
58bb0df
Merge branch 'branch-23.11' of github.com:nv-morpheus/Morpheus into d…
dagardner-nv Nov 27, 2023
79fde60
Fix
dagardner-nv Nov 27, 2023
d91099a
Since our milvus client inherits from the upstream client we can't do…
dagardner-nv Nov 27, 2023
336c9c3
Fix updated calls to _verify_deps
dagardner-nv Nov 27, 2023
7ecd37c
Revert unintentional change
dagardner-nv Nov 27, 2023
2ed7ca2
Remove unused logger definition
dagardner-nv Nov 27, 2023
b1e6123
Don't log errors for optional deps
dagardner-nv Nov 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ci/conda/recipes/morpheus/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ outputs:
run:
# Runtime only requirements. This + setup.py is the definitive runtime requirement list
- {{ pin_compatible('cuda-cudart', min_pin='x.x', max_pin='x') }}
- beautifulsoup4=4.12
- click >=8
- configargparse 1.5.*
- cudf
Expand All @@ -77,6 +78,8 @@ outputs:
- dill
- distributed
- docker-py 5.0.*
- elasticsearch==8.9.0
- feedparser=6.0.10
- grpcio # Version determined from cudf
- libmrc
- libwebp>=1.3.2 # Required for CVE mitigation: https://nvd.nist.gov/vuln/detail/CVE-2023-4863
Expand All @@ -92,12 +95,15 @@ outputs:
- python-confluent-kafka 1.9.2
- pytorch 2.0.1
- pytorch-cuda
- requests=2.31
- requests-cache=1.1
- scikit-learn 1.2.2.*
- sqlalchemy <=2.0 # 2.0 is incompatible with pandas=1.3
- tqdm 4.*
- tritonclient 2.26.*
- typing_utils 0.1.*
- watchdog 2.1.*
- websockets
run_constrained:
# Since we dont explicitly require this but other packages might, constrain the versions.
- {{ pin_compatible('cudatoolkit', min_pin='x.x', max_pin='x') }}
Expand Down
11 changes: 11 additions & 0 deletions docker/conda/environments/cuda11.8_runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,14 @@ channels:
dependencies:
- nb_conda_kernels
- pip

####### Pip Transitive Dependencies (keep sorted!) #######
# These are dependencies that are available on conda, but are required by the pip packages listed below. Its much
# better to install them with conda than pip to allow for better dependency resolution.
- py4j=0.10

- pip:
# Add additional pip only dependencies here
- databricks-connect
- pymilvus==2.3.2
- milvus==2.3.2