You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2024/10/20 08:28:34 UTC
(spark) branch master updated: [SPARK-50042][PYTHON] Upgrade numpy 2 for python linter
This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 4883689e90bd [SPARK-50042][PYTHON] Upgrade numpy 2 for python linter
4883689e90bd is described below
commit 4883689e90bdeddddc8dcadf859fd2979a58b40a
Author: Ruifeng Zheng <ru...@apache.org>
AuthorDate: Sun Oct 20 17:28:22 2024 +0900
[SPARK-50042][PYTHON] Upgrade numpy 2 for python linter
### What changes were proposed in this pull request?
Upgrade numpy for python linter
### Why are the changes needed?
Upgrade numpy for python linter
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
ci
### Was this patch authored or co-authored using generative AI tooling?
no
Closes #48565 from zhengruifeng/infra_numpy_lint.
Authored-by: Ruifeng Zheng <ru...@apache.org>
Signed-off-by: Hyukjin Kwon <gu...@apache.org>
---
.github/workflows/build_and_test.yml | 2 +-
python/pyspark/ml/linalg/__init__.py | 4 ++--
python/pyspark/mllib/linalg/__init__.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 14d93a498fc5..c43c7df22039 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -723,7 +723,7 @@ jobs:
# See 'ipython_genutils' in SPARK-38517
# See 'docutils<0.18.0' in SPARK-39421
python3.9 -m pip install 'sphinx==4.5.0' mkdocs 'pydata_sphinx_theme>=0.13' sphinx-copybutton nbsphinx numpydoc jinja2 markupsafe 'pyzmq<24.0.0' \
- ipython ipython_genutils sphinx_plotly_directive 'numpy==1.26.4' pyarrow pandas 'plotly>=4.8' 'docutils<0.18.0' \
+ ipython ipython_genutils sphinx_plotly_directive numpy pyarrow pandas 'plotly>=4.8' 'docutils<0.18.0' \
'flake8==3.9.0' 'mypy==1.8.0' 'pytest==7.1.3' 'pytest-mypy-plugins==1.9.3' 'black==23.9.1' \
'pandas-stubs==1.2.0.53' 'grpcio==1.62.0' 'grpc-stubs==1.24.11' 'googleapis-common-protos-stubs==2.2.0' \
'sphinxcontrib-applehelp==1.0.4' 'sphinxcontrib-devhelp==1.0.2' 'sphinxcontrib-htmlhelp==2.0.1' 'sphinxcontrib-qthelp==1.0.3' 'sphinxcontrib-serializinghtml==1.1.5'
diff --git a/python/pyspark/ml/linalg/__init__.py b/python/pyspark/ml/linalg/__init__.py
index d470f8b8b5c4..cedd3b04564e 100644
--- a/python/pyspark/ml/linalg/__init__.py
+++ b/python/pyspark/ml/linalg/__init__.py
@@ -706,12 +706,12 @@ class SparseVector(Vector):
elif isinstance(other, SparseVector):
# Find out common indices.
- self_cmind = np.in1d(self.indices, other.indices, assume_unique=True)
+ self_cmind = np.isin(self.indices, other.indices, assume_unique=True)
self_values = self.values[self_cmind]
if self_values.size == 0:
return np.float64(0.0)
else:
- other_cmind = np.in1d(other.indices, self.indices, assume_unique=True)
+ other_cmind = np.isin(other.indices, self.indices, assume_unique=True)
return np.dot(self_values, other.values[other_cmind])
else:
diff --git a/python/pyspark/mllib/linalg/__init__.py b/python/pyspark/mllib/linalg/__init__.py
index 02cef36c11c4..40f0255a91bb 100644
--- a/python/pyspark/mllib/linalg/__init__.py
+++ b/python/pyspark/mllib/linalg/__init__.py
@@ -813,12 +813,12 @@ class SparseVector(Vector):
elif isinstance(other, SparseVector):
# Find out common indices.
- self_cmind = np.in1d(self.indices, other.indices, assume_unique=True)
+ self_cmind = np.isin(self.indices, other.indices, assume_unique=True)
self_values = self.values[self_cmind]
if self_values.size == 0:
return np.float64(0.0)
else:
- other_cmind = np.in1d(other.indices, self.indices, assume_unique=True)
+ other_cmind = np.isin(other.indices, self.indices, assume_unique=True)
return np.dot(self_values, other.values[other_cmind])
else:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org