mirror of
https://github.com/wassname/ray.git
synced 2026-06-27 16:31:25 +08:00
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
This commit is contained in:
committed by
Simon Mo
parent
ddadc18ef6
commit
c33d6662ce
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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)
|
||||
+1
-7
@@ -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:
|
||||
|
||||
Vendored
-29
@@ -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
|
||||
Vendored
-5
@@ -26,8 +26,3 @@ echo "Python library will be built."
|
||||
fi
|
||||
|
||||
unamestr="$(uname)"
|
||||
|
||||
##############################################
|
||||
# modin
|
||||
##############################################
|
||||
bash "$TP_SCRIPT_DIR/build_modin.sh" $PYTHON_EXECUTABLE
|
||||
|
||||
Reference in New Issue
Block a user