Skip to content

Commit

Permalink
Merge branch 'mdd_fix-patches' into 'branch-0.2.1-EA'
Browse files Browse the repository at this point in the history
Fixing issue where patch couldnt be applied due to formatting

See merge request morpheus/morpheus!76
  • Loading branch information
mdemoret-nv committed Jan 4, 2022
2 parents 98988fd + 4310975 commit c8f11ac
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion cmake/deps/patches/TritonClient.patch
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ index 4df5a71..967c0ea 100644
+ LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/libgrpcclient.ldscript"
)
endif() # NOT WIN32

@@ -312,7 +312,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_PERF_ANALYZER)
httpclient
PROPERTIES
Expand All @@ -34,3 +34,4 @@ index 4df5a71..967c0ea 100644
+ LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/libhttpclient.ldscript"
)
endif() # NOT WIN32

12 changes: 6 additions & 6 deletions cmake/deps/patches/cudf.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ index 1dd3348a9c..0a115e471b 100644
${CUDF_SOURCE_DIR}/include/cudf_test
+ ${CUDF_SOURCE_DIR}/include/nvtext
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

install(DIRECTORY
diff --git a/python/cudf/cudf/_lib/column.pxd b/python/cudf/cudf/_lib/column.pxd
index 2df958466c..bce326b125 100644
--- a/python/cudf/cudf/_lib/column.pxd
+++ b/python/cudf/cudf/_lib/column.pxd
@@ -10,7 +10,7 @@ from cudf._lib.cpp.column.column_view cimport column_view, mutable_column_view
from cudf._lib.cpp.types cimport size_type


-cdef class Column:
+cdef public class Column[object PyColumn, type PyColumn_t]:
cdef public:
Expand All @@ -44,10 +44,10 @@ index 2299c924bb..fc8e461440 100644
+++ b/python/cudf/cudf/_lib/table.pxd
@@ -6,7 +6,7 @@ from cudf._lib.cpp.table.table cimport table
from cudf._lib.cpp.table.table_view cimport mutable_table_view, table_view


-cdef class Table:
+cdef public class Table[object PyTable, type PyTable_t]:
cdef dict __dict__

cdef table_view table_view_from_columns(columns) except *

0 comments on commit c8f11ac

Please sign in to comment.