Skip to content
This repository has been archived by the owner on Oct 9, 2023. It is now read-only.

resolve CI/sudo and minor code adjustments #1698

Merged
merged 1 commit into from
Oct 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .azure/gpu-special-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ jobs:
echo "##vso[task.setvariable variable=CONTAINER_ID]$(head -1 /proc/self/cgroup|cut -d/ -f3)"
displayName: 'Set environment variables'

- script: |
/tmp/docker exec -t -u 0 $CONTAINER_ID \
sh -c "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confold" -y install sudo"
displayName: 'Install Sudo in container (thanks Microsoft!)'

- bash: |
echo $CUDA_VISIBLE_DEVICES
lspci | egrep 'VGA|3D'
Expand All @@ -56,7 +51,6 @@ jobs:
displayName: 'Sanity check'

- script: |
sudo apt-get install -y build-essential gcc cmake software-properties-common
python -m pip install "pip==22.2.1"
pip --version
pip install '.[image,test]' -r requirements/testing_image.txt -U
Expand Down
6 changes: 0 additions & 6 deletions .azure/template-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ jobs:
echo "##vso[task.setvariable variable=CONTAINER_ID]$(head -1 /proc/self/cgroup|cut -d/ -f3)"
displayName: 'Set environment variables'

- script: |
/tmp/docker exec -t -u 0 $CONTAINER_ID \
sh -c "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confold" -y install sudo"
displayName: 'Install Sudo in container (thanks Microsoft!)'

- bash: |
echo $CUDA_VISIBLE_DEVICES
lspci | egrep 'VGA|3D'
Expand All @@ -47,7 +42,6 @@ jobs:
displayName: 'Sanity check'

- script: |
sudo apt-get install -y build-essential gcc cmake software-properties-common
python -m pip install "pip==22.2.1"
pip --version
pip install '.[${{topic}},test]' -r "requirements/testing_${{topic}}.txt" -U --prefer-binary
Expand Down
2 changes: 1 addition & 1 deletion src/flash/core/serve/dag/order.py
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@
# If we have many tiny groups left, then it's best to simply iterate.
if not is_init_sorted:
prev_len = len(init_stack)
if type(init_stack) is dict:
if isinstance(init_stack, dict):

Check warning on line 461 in src/flash/core/serve/dag/order.py

View check run for this annotation

Codecov / codecov/patch

src/flash/core/serve/dag/order.py#L461

Added line #L461 was not covered by tests
init_stack = set(init_stack)
init_stack = set_difference(init_stack, result)
N = len(init_stack)
Expand Down
2 changes: 1 addition & 1 deletion src/flash/core/serve/dag/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,6 @@
(literal<type=tuple>,)

"""
if istask(x) or type(x) is list or type(x) is dict:
if istask(x) or isinstance(x, (list, dict)):

Check warning on line 448 in src/flash/core/serve/dag/task.py

View check run for this annotation

Codecov / codecov/patch

src/flash/core/serve/dag/task.py#L448

Added line #L448 was not covered by tests
return (literal(x),)
return x
2 changes: 1 addition & 1 deletion src/flash/core/serve/dag/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
>>> key_split('_(x)') # strips unpleasant characters
'x'
"""
if type(s) is bytes:
if isinstance(s, bytes):

Check warning on line 75 in src/flash/core/serve/dag/utils.py

View check run for this annotation

Codecov / codecov/patch

src/flash/core/serve/dag/utils.py#L75

Added line #L75 was not covered by tests
s = s.decode()
if type(s) is tuple:
s = s[0]
Expand Down