[gpuCI] Forward-merge branch-22.10 to branch-22.12 [skip gpuci]

python/cudf/cudf/core/scalar.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2020-2022, NVIDIA CORPORATION.
 
 import decimal
+import operator
 from collections import OrderedDict
 
 import numpy as np
@@ -353,7 +354,13 @@ def _binaryop(self, other, op: str):
     def _dispatch_scalar_binop(self, other, op):
         if isinstance(other, Scalar):
             other = other.value
-        return getattr(self.value, op)(other)
+        try:
+            func = getattr(operator, op)
+        except AttributeError:
+            func = getattr(self.value, op)
+        else:
+            return func(self.value, other)
+        return func(other)
 
     def _unaop_result_type_or_error(self, op):
         if op == "__neg__" and self.dtype == "bool":

python/cudf/cudf/tests/test_scalar.py

@@ -443,3 +443,10 @@ def test_default_float_bitwidth_scalar(default_float_bitwidth):
     # Test that float scalars are default to 32 bits under user options.
     slr = cudf.Scalar(128.0)
     assert slr.dtype == np.dtype(f"f{default_float_bitwidth//8}")
+
+
+def test_scalar_numpy_casting():
+    # binop should upcast to wider type
+    s1 = cudf.Scalar(1, dtype=np.int32)
+    s2 = np.int64(2)
+    assert s1 < s2