Merge branch 'misc-packaging' of github.com:jameslamb/legate-datafram…

…e into misc-packaging
rapidsai · Dec 31, 2024 · aed9222 · aed9222
2 parents 39fcf4d + 82ea903
commit aed9222
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/cpp/src/core/library.cpp b/cpp/src/core/library.cpp
@@ -43,13 +43,6 @@ class Mapper : public legate::mapping::Mapper {
   Mapper(const Mapper& rhs)            = delete;
   Mapper& operator=(const Mapper& rhs) = delete;
 
-  legate::mapping::TaskTarget task_target(
-    const legate::mapping::Task& task,
-    const std::vector<legate::mapping::TaskTarget>& options) override
-  {
-    return *options.begin();  // Choose first priority
-  }
-
   std::vector<legate::mapping::StoreMapping> store_mappings(
     const legate::mapping::Task& task,
     const std::vector<legate::mapping::StoreTarget>& options) override

diff --git a/python/legate_dataframe/lib/core/scalar.pyx b/python/legate_dataframe/lib/core/scalar.pyx
@@ -13,7 +13,6 @@ import numbers
 import cudf
 import legate.core
 import numpy
-from cudf._lib.scalar import as_device_scalar
 
 ScalarLike = numpy.number | numbers.Number | cudf.Scalar | legate.core.Scalar
 
@@ -39,5 +38,5 @@ cdef cpp_ScalarArg cpp_scalar_arg_from_python(scalar: ScalarLike):
 
     # NOTE: Converting to a cudf scalar isn't really ideal, as we copy
     #       to the device, just to copy it back again to get a legate one.
-    cdef DeviceScalar cudf_scalar = <DeviceScalar>as_device_scalar(scalar)
+    cdef DeviceScalar cudf_scalar = <DeviceScalar>(cudf.Scalar(scalar).device_value)
     return cpp_ScalarArg(dereference(cudf_scalar.get_raw_ptr()))