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

Commit

Permalink
resolve CI/sudo and minor code adjustments (#1698)
Browse files Browse the repository at this point in the history
  • Loading branch information
Borda authored Oct 8, 2023
1 parent 9eecb1d commit a374dd4
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 15 deletions.
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 @@ def finish_now_key(x):
# 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):
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 @@ def quote(x):
(literal<type=tuple>,)
"""
if istask(x) or type(x) is list or type(x) is dict:
if istask(x) or isinstance(x, (list, dict)):
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 @@ def key_split(s):
>>> key_split('_(x)') # strips unpleasant characters
'x'
"""
if type(s) is bytes:
if isinstance(s, bytes):
s = s.decode()
if type(s) is tuple:
s = s[0]
Expand Down

0 comments on commit a374dd4

Please sign in to comment.