Skip to content

Commit 37c08a6

Browse files
authored
Resolve compatibility issue for kubernetes cases under CGroup2 (#3303)
1 parent 9f0bf34 commit 37c08a6

File tree

56 files changed

+204
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+204
-151
lines changed

.github/workflows/benchmark-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
shell: bash
3636
run: |
3737
source ./ci/install-conda.sh
38-
python -m pip install --upgrade pip "setuptools<64" wheel coverage;
38+
python -m pip install --upgrade pip setuptools wheel coverage;
3939
4040
- name: Install dependencies
4141
id: build

.github/workflows/core-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
shell: bash
3636
run: |
3737
source ./ci/install-conda.sh
38-
python -m pip install --upgrade pip "setuptools<64" wheel coverage;
38+
python -m pip install --upgrade pip setuptools wheel coverage;
3939
4040
- name: Install dependencies
4141
env:

.github/workflows/os-compat-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
shell: bash
3333
run: |
3434
source ./ci/install-conda.sh
35-
python -m pip install --upgrade pip "setuptools<64" wheel coverage;
35+
python -m pip install --upgrade pip setuptools wheel coverage;
3636
3737
- name: Install dependencies
3838
env:

.github/workflows/platform-ci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
os: [ubuntu-latest]
21-
python-version: [3.8-ray, 3.8-ray-deploy, 3.8-ray-dag, 3.8-vineyard, 3.8-dask]
21+
python-version: [3.8-kubernetes, 3.8-ray, 3.8-ray-deploy, 3.8-ray-dag, 3.8-vineyard, 3.8-dask]
2222
include:
23-
- { os: ubuntu-20.04, python-version: 3.8-kubernetes, no-common-tests: 1,
23+
- { os: ubuntu-latest, python-version: 3.8-kubernetes, no-common-tests: 1,
2424
no-deploy: 1, with-kubernetes: "with Kubernetes" }
2525
- { os: ubuntu-20.04, python-version: 3.8-hadoop, no-common-tests: 1,
2626
no-deploy: 1, with-hadoop: "with hadoop" }
@@ -47,13 +47,14 @@ jobs:
4747
shell: bash
4848
run: |
4949
source ./ci/install-conda.sh
50-
python -m pip install --upgrade pip "setuptools<64" wheel coverage;
50+
python -m pip install --upgrade pip setuptools wheel coverage
5151
5252
- name: Start minikube
5353
if: ${{ matrix.with-kubernetes }}
54-
with:
55-
driver: none
5654
uses: medyagh/setup-minikube@master
55+
with:
56+
driver: docker
57+
mount-path: '/home/runner:/home/runner'
5758

5859
- name: Install dependencies
5960
env:
@@ -125,6 +126,7 @@ jobs:
125126
RUN_DASK: ${{ matrix.run-dask }}
126127
NO_COMMON_TESTS: ${{ matrix.no-common-tests }}
127128
NUMPY_EXPERIMENTAL_ARRAY_FUNCTION: 1
129+
USE_MINIKUBE_DOCKER_ENV: true
128130
CHANGE_MINIKUBE_NONE_USER: true
129131
shell: bash
130132
run: |

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
9595
# do compatibility test for earliest supported pandas release
9696
if [[ "$(mars.test.module)" == "dataframe" ]]; then
97-
pip install numpy\<1.24.0
97+
pip install numpy\<1.24.0 sqlalchemy\<2.0
9898
pip install -i https://pkgs.dev.azure.com/mars-project/mars/_packaging/pandas/pypi/simple/ pandas==1.0.5
9999
pytest $PYTEST_CONFIG -m pd_compat mars/dataframe
100100
mv .coverage build/.coverage.pd_compat.file

benchmarks/tpch/gen_data.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ def to_parquet(args):
102102
def generate(
103103
tables, SCALE_FACTOR, folder, upload_to_s3, validate_dataset, num_processes
104104
):
105-
106105
if upload_to_s3:
107106
assert "AWS_ACCESS_KEY_ID" in os.environ, "AWS credentials not set"
108107
else:
@@ -117,7 +116,6 @@ def generate(
117116
fs = s3fs.S3FileSystem()
118117

119118
for table_name, (table_short, num_pieces, load_func) in tables.items():
120-
121119
if upload_to_s3:
122120
output_prefix = f"s3://{folder}/{table_name}.pq"
123121
else:

mars/core/entity/executable.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ def _thread_body(self):
5656
fut.set_result(None)
5757
except (RuntimeError, ConnectionError, KeyError, ActorNotExist):
5858
fut.set_result(None)
59-
except Exception as ex: # pragma: no cover # noqa: E722 # nosec # pylint: disable=bare-except
59+
except (
60+
Exception
61+
) as ex: # pragma: no cover # noqa: E722 # nosec # pylint: disable=bare-except
6062
fut.set_exception(ex)
6163
finally:
6264
del session

mars/dataframe/base/shift.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,7 @@ def _tile_series(cls, op):
299299
to_concats = [c]
300300
left = abs(op.periods)
301301
while left > 0 and 0 <= prev_i < inp.chunk_shape[0]:
302-
prev_chunk = inp.cix[
303-
prev_i,
304-
]
302+
prev_chunk = inp.cix[prev_i,]
305303
size = min(left, prev_chunk.shape[0])
306304
left -= size
307305
prev_i = prev_i - 1 if inc else prev_i + 1

mars/dataframe/base/to_numeric.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424

2525
class DataFrameToNumeric(DataFrameOperand, DataFrameOperandMixin):
26-
2726
errors = StringField("errors")
2827
downcast = StringField("downcast")
2928

mars/dataframe/datasource/from_tensor.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,7 @@ def _tile_input_1d_tileables(cls, op: "DataFrameFromTensor"):
310310
index_value = parse_index(pd_index, store_data=True)
311311
else:
312312
assert op.index is not None
313-
index_chunk = in_tensors[-1].cix[
314-
i,
315-
]
313+
index_chunk = in_tensors[-1].cix[i,]
316314
index_value = parse_index(
317315
pd.Index([], dtype=index_chunk.dtype),
318316
index_chunk,

0 commit comments

Comments
 (0)