From c33d6662ce0cc0cea244b7d17effeac9844ccbda Mon Sep 17 00:00:00 2001 From: Devin Petersohn Date: Thu, 5 Sep 2019 23:46:27 -0700 Subject: [PATCH] Remove Modin from Ray wheels. (#5647) There are several reasons for this: * We no longer support python2 * There should be only 1 way of installing Modin * Issue management on these wheels * I have never heard of anyone using this feature * It is rarely kept up to date * Modin depends on specific versions of Ray because of past API changes --- .github/CODEOWNERS | 1 - .gitignore | 3 --- python/ray/__init__.py | 3 --- python/ray/tests/test_modin.py | 25 ------------------------- python/setup.py | 8 +------- thirdparty/scripts/build_modin.sh | 29 ----------------------------- thirdparty/scripts/setup.sh | 5 ----- 7 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 python/ray/tests/test_modin.py delete mode 100755 thirdparty/scripts/build_modin.sh diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5b92a4f59..a4e6842af 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -13,7 +13,6 @@ /python/ray/ @ray-project/ray-core-python !/python/ray/tune/ @ray-project/ray-core-python !/python/ray/rllib/ @ray-project/ray-core-python -!/python/ray/modin/ @ray-project/ray-core-python # Java worker. /java/ @ray-project/ray-core-java diff --git a/.gitignore b/.gitignore index 9b6947880..9983fe144 100644 --- a/.gitignore +++ b/.gitignore @@ -12,9 +12,6 @@ /src/ray/raylet/format/*_generated.h /java/runtime/src/main/java/org/ray/runtime/generated/* -# Modin source files -/python/ray/modin - # Redis temporary files *dump.rdb diff --git a/python/ray/__init__.py b/python/ray/__init__.py index fd251b1e2..5a9515fd7 100644 --- a/python/ray/__init__.py +++ b/python/ray/__init__.py @@ -53,9 +53,6 @@ except ImportError as e: e.args += (helpful_message, ) raise -modin_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "modin") -sys.path.append(modin_path) - from ray._raylet import ( ActorCheckpointID, ActorClassID, diff --git a/python/ray/tests/test_modin.py b/python/ray/tests/test_modin.py deleted file mode 100644 index c0ea8d339..000000000 --- a/python/ray/tests/test_modin.py +++ /dev/null @@ -1,25 +0,0 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -import pytest - -import ray - - -def test_modin_import_with_ray_init(shutdown_only): - ray.init(num_cpus=1) - import modin.pandas as pd - frame_data = [1, 2, 3, 4, 5, 6, 7, 8] - frame = pd.DataFrame(frame_data) - assert frame.sum().squeeze() == sum(frame_data) - - -# The following can be activated once we have a modin release that -# includes https://github.com/modin-project/modin/pull/472. -@pytest.mark.skip(reason="needs #472 in modin") -def test_modin_import(shutdown_only): - import modin.pandas as pd - frame_data = [1, 2, 3, 4, 5, 6, 7, 8] - frame = pd.DataFrame(frame_data) - assert frame.sum().squeeze() == sum(frame_data) diff --git a/python/setup.py b/python/setup.py index abca6870f..f995a6c36 100644 --- a/python/setup.py +++ b/python/setup.py @@ -90,13 +90,7 @@ class build_ext(_build_ext.build_ext): for name in filenames: pyarrow_files.append(os.path.join(root, name)) - # Make sure the relevant files for modin get copied. - modin_files = [] - for (root, dirs, filenames) in os.walk("./ray/modin"): - for name in filenames: - modin_files.append(os.path.join(root, name)) - - files_to_include = ray_files + pyarrow_files + modin_files + files_to_include = ray_files + pyarrow_files # Copy over the autogenerated protobuf Python bindings. for directory in generated_python_directories: diff --git a/thirdparty/scripts/build_modin.sh b/thirdparty/scripts/build_modin.sh deleted file mode 100755 index 8b066aa8e..000000000 --- a/thirdparty/scripts/build_modin.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -set -x - -# Cause the script to exit if a single command fails. -set -e - -if [[ -z "$1" ]]; then - PYTHON_EXECUTABLE=`which python` -else - PYTHON_EXECUTABLE=$1 -fi - -PYTHON_VERSION="$($PYTHON_EXECUTABLE -c 'import sys; print(sys.version_info[0])')" - -TP_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)/../ -MODIN_VERSION=0.5.0 -MODIN_WHEELS_FNAME="modin-$MODIN_VERSION-py$PYTHON_VERSION-none-any.whl" -MODIN_WHEELS_URL="https://github.com/modin-project/modin/releases/download/v$MODIN_VERSION/" - -pushd $TP_DIR/../python/ray/ -rm -rf modin -mkdir modin -pushd modin -curl -kL --silent "$MODIN_WHEELS_URL$MODIN_WHEELS_FNAME" -o "$MODIN_WHEELS_FNAME" -unzip -qq "$MODIN_WHEELS_FNAME" -rm "$MODIN_WHEELS_FNAME" -popd -popd diff --git a/thirdparty/scripts/setup.sh b/thirdparty/scripts/setup.sh index ab0d82c7b..a6492f0df 100755 --- a/thirdparty/scripts/setup.sh +++ b/thirdparty/scripts/setup.sh @@ -26,8 +26,3 @@ echo "Python library will be built." fi unamestr="$(uname)" - -############################################## -# modin -############################################## -bash "$TP_SCRIPT_DIR/build_modin.sh" $PYTHON_EXECUTABLE