Fixing compilation

nv-morpheus · Aug 23, 2023 · 4e89a82 · 4e89a82
1 parent 49e8d63
commit 4e89a82
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/ci/conda/environments/dev_env.yml b/ci/conda/environments/dev_env.yml
@@ -28,10 +28,8 @@ dependencies:
   - boost-cpp=1.82
   - ccache
   - cmake=3.24
-  - cuda-nvml-dev=11.8
-  - cudatoolkit=11.8
-  - cxx-compiler # Does not need a version. Specified by compiler packages
-  - cython>=0.29,<0.30
+  - cuda-toolkit # Version comes from the channel above
+  - cxx-compiler # Sets up the distro versions of our compilers
   - doxygen=1.9.2
   - flake8
   - flatbuffers=2.0
@@ -54,7 +52,7 @@ dependencies:
   - libtool
   - ninja=1.10
   - nlohmann_json=3.9
-  - nodejs=18.12
+  - nodejs=18
   - numactl-libs-cos7-x86_64
   - numpy>=1.21
   - pip

diff --git a/cpp/mrc/src/internal/control_plane/client.hpp b/cpp/mrc/src/internal/control_plane/client.hpp
@@ -20,7 +20,6 @@
 #include "internal/control_plane/state/root_state.hpp"
 #include "internal/grpc/client_streaming.hpp"
 #include "internal/grpc/stream_writer.hpp"
-#include "internal/resources/iresources_provider.hpp"
 #include "internal/resources/partition_resources_base.hpp"
 #include "internal/runnable/runnable_resources.hpp"
 

diff --git a/cpp/mrc/src/internal/executor/executor_definition.cpp b/cpp/mrc/src/internal/executor/executor_definition.cpp
@@ -101,7 +101,6 @@ std::shared_ptr<ExecutorDefinition> ExecutorDefinition::unwrap(std::shared_ptr<p
 void ExecutorDefinition::register_pipeline(std::shared_ptr<pipeline::IPipeline> pipeline)
 {
     CHECK(pipeline) << "Must pass a non-null pipeline pointer to register_pipeline";
-    CHECK(m_pipeline_manager == nullptr);
 
     auto full_pipeline = pipeline::PipelineDefinition::unwrap(std::move(pipeline));
 

diff --git a/cpp/mrc/src/internal/pipeline/manifold_definition.cpp b/cpp/mrc/src/internal/pipeline/manifold_definition.cpp
@@ -17,7 +17,7 @@
 
 #include "internal/pipeline/manifold_definition.hpp"
 
-namespace mrc::runnable {
+namespace mrc::pipeline {
 
 ManifoldDefinition::ManifoldDefinition(std::string name,
                                        std::type_index type_index,
@@ -44,4 +44,4 @@ std::shared_ptr<manifold::Interface> ManifoldDefinition::build(runnable::IRunnab
     return m_initializer_fn(m_name, resources);
 }
 
-}  // namespace mrc::runnable
+}  // namespace mrc::pipeline