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.

Sign up for GitHub

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

Jump to bottom

Fix release and dev container builds #1027

Merged
merged 2 commits into from
Jul 10, 2023
Merged

Fix release and dev container builds #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daf0fc7
fix release and dev container builds
cwharris Jul 10, 2023
943a24f
add python-confluent-kafka
cwharris Jul 10, 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
3 changes: 2 additions & 1 deletion ci/conda/recipes/morpheus/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ outputs:
- cudf {{ rapids_version }}
- cython >=0.29,<0.30
- libcudf {{ rapids_version }}
- librdkafka 1.7
- librdkafka 1.9.2
- mrc {{ minor_version }}
- pip
- pyarrow * *_cuda # Ensure we get a CUDA build. Version determined by cuDF
Expand Down Expand Up @@ -92,6 +92,7 @@ outputs:
- pluggy 1.0.*
- pyarrow * *_cuda # Ensure we get a CUDA build. Version determined by cuDF
- python
- python-confluent-kafka 1.9.2
- pytorch 2.0.1
- pytorch-cuda
- scikit-learn 1.2.2.*
Expand Down
2 changes: 1 addition & 1 deletion ci/conda/recipes/morpheus/morpheus_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ CMAKE_ARGS="-DMORPHEUS_PYTHON_BUILD_STUBS=${MORPHEUS_PYTHON_BUILD_STUBS=-"ON"} $
CMAKE_ARGS="-DMORPHEUS_PYTHON_INPLACE_BUILD=ON ${CMAKE_ARGS}"
CMAKE_ARGS="-DMORPHEUS_PYTHON_BUILD_WHEEL=ON ${CMAKE_ARGS}"
CMAKE_ARGS="-DCMAKE_BUILD_RPATH_USE_ORIGIN=ON ${CMAKE_ARGS}"
CMAKE_ARGS="-DCMAKE_CUDA_ARCHITECTURES=${CMAKE_CUDA_ARCHITECTURES=-"all"} ${CMAKE_ARGS}"
CMAKE_ARGS="-DCMAKE_CUDA_ARCHITECTURES=${CMAKE_CUDA_ARCHITECTURES=-"RAPIDS"} ${CMAKE_ARGS}"
CMAKE_ARGS="-DPython_EXECUTABLE=${PYTHON} ${CMAKE_ARGS}"
CMAKE_ARGS="-DPYTHON_EXECUTABLE=${PYTHON} ${CMAKE_ARGS}" # for pybind11

Expand Down
2 changes: 1 addition & 1 deletion ci/conda/recipes/run_conda_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export CONDA_COMMAND=${CONDA_COMMAND:-"mambabuild"}
export MORPHEUS_ROOT=${MORPHEUS_ROOT:-$(git rev-parse --show-toplevel)}

# Export script_env variables that must be set for conda build
export CMAKE_CUDA_ARCHITECTURES=${CMAKE_CUDA_ARCHITECTURES:-"ALL"}
export CMAKE_CUDA_ARCHITECTURES=${CMAKE_CUDA_ARCHITECTURES:-"RAPIDS"}
export MORPHEUS_PYTHON_BUILD_STUBS=${MORPHEUS_PYTHON_BUILD_STUBS:-"ON"}
export MORPHEUS_CACHE_DIR=${MORPHEUS_CACHE_DIR:-"${MORPHEUS_ROOT}/.cache"}
export PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}
Expand Down
4 changes: 2 additions & 2 deletions docker/conda/environments/cuda11.8_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ dependencies:
- gxx_linux-64=11.2
- include-what-you-use=0.18
- isort
- librdkafka=1.7.0
- librdkafka=1.9.2
- mlflow>=2.2.1,<3
- mrc=23.07
- myst-parser==1.0.0
Expand All @@ -80,7 +80,7 @@ dependencies:
- pytest
- pytest-benchmark>=4.0
- pytest-cov
- python-confluent-kafka=1.7.0
- python-confluent-kafka=1.9.2
- python-graphviz
- python=3.10
- pytorch=2.0.1
Expand Down