Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kiko/fix build #175

Merged
merged 94 commits into from
Feb 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
5db8b9a
syncing to 1.7.2
dmlyubim Jan 10, 2023
55bc018
common public rllib cql renames
dmlyubim Jan 10, 2023
31b77f5
patching sac dist class get
dmlyubim Jan 10, 2023
844dba4
retrofitting rllib/offline package to 1.7.2
dmlyubim Jan 10, 2023
ace3f85
retrofit space_utils 1.7.2
dmlyubim Jan 10, 2023
6640af3
retrofit ray.tune.registry to 1.7.2 (add input registry)
dmlyubim Jan 10, 2023
a9b7a56
test changes
dmlyubim Jan 10, 2023
e09c33d
cql test pendulum data
dmlyubim Jan 10, 2023
313f88a
in 1.3, replay buffer isn't reworked to track capacity vs. current size
dmlyubim Jan 10, 2023
1e5159a
Updating metrics to 1.7.2 (update sampled count on request to enable …
dmlyubim Jan 11, 2023
5f12afa
slight test refactoring to enable intermediate debugging
dmlyubim Jan 11, 2023
8598a97
fixing bazel test //rllib:test_cql
dmlyubim Jan 11, 2023
0c20a1b
additional cql_sac cleanup
dmlyubim Jan 11, 2023
2dbfb9d
removing cql apex sac tests
dmlyubim Jan 12, 2023
016bde6
rolling back non-existent policy call signature in offline component
dmlyubim Jan 12, 2023
e099a1d
trying to fix macos python verison at 3.8.15
dmlyubim Jan 12, 2023
625bf4b
changing bazel definition for test_cql.
dmlyubim Jan 13, 2023
d5abccb
parity with BUILD for test_cql in 1.7.2 (removing data glob) -- does …
dmlyubim Jan 13, 2023
d56abda
fixes -- this now runs with the benchmark
dmlyubim Jan 13, 2023
fb7ef1a
Rolling back cql_dqn cleanup
dmlyubim Jan 19, 2023
90660d0
trying to add data label to test
dmlyubim Jan 21, 2023
057eebf
set recursive mod 777 on /home/vsts/work/_temp/_bazel_vsts directory …
Kiko-Aumond Jan 23, 2023
aa2eae4
use $TEST_TMPDIR env variable instead of literal directory name
Kiko-Aumond Jan 24, 2023
e2f9e7f
Kiko/cql 1.7.2 port (#172)
Kiko-Aumond Jan 24, 2023
f809b8f
brining more changes from 1.13.0 to update timesteps_total metric cor…
dmlyubim Jan 25, 2023
65ddbce
Merge branch 'dmlyubim/cql-1.7.2-port' of github.com:BonsaiAI/ray int…
dmlyubim Jan 25, 2023
bf7c81d
REVERTING TO PYTHON 3.8 FOR MAC
dmlyubim Jan 26, 2023
1f8c889
explicitly set MACOSX_DEPLOYMENT_TARGET env variable
Kiko-Aumond Jan 26, 2023
3008348
Merge remote-tracking branch 'origin/dmlyubim/cql-1.7.2-port' into ki…
Kiko-Aumond Jan 26, 2023
fcadf4b
removed minor version of Python; renamed steps to relect correct Pyth…
Kiko-Aumond Jan 26, 2023
e19f432
get latest pip version to test MacOs wheels
Kiko-Aumond Jan 27, 2023
2dfff9d
updated hash
Kiko-Aumond Jan 27, 2023
0752873
undid changes to info,yml
Kiko-Aumond Jan 27, 2023
278c16c
unbounded setuptools
Kiko-Aumond Jan 27, 2023
9326393
undid change
Kiko-Aumond Jan 27, 2023
1473ead
Fix MacOs version if bdist_wheel generates incorrect MacOS version ta…
Kiko-Aumond Jan 27, 2023
af5edfe
undid changes
Kiko-Aumond Jan 27, 2023
4c89d1e
undid changes
Kiko-Aumond Jan 27, 2023
e0f89f8
undid changes
Kiko-Aumond Jan 27, 2023
53fb100
force reinstall tune and upstream requirements
Kiko-Aumond Jan 28, 2023
a6543c9
updatd CI hash
Kiko-Aumond Jan 28, 2023
62c1e59
updated dependencies
Kiko-Aumond Jan 28, 2023
e8e2720
updated requirements
Kiko-Aumond Jan 28, 2023
dc74f94
updated requirements
Kiko-Aumond Jan 28, 2023
25c4738
updated requirements
Kiko-Aumond Jan 28, 2023
4ffb1fe
updated requirements
Kiko-Aumond Jan 28, 2023
3cd0f4d
updated requirements
Kiko-Aumond Jan 28, 2023
9075ae5
updated ci folder hash
Kiko-Aumond Jan 28, 2023
46972ee
updated requirements
Kiko-Aumond Jan 28, 2023
0d91855
updated requirements
Kiko-Aumond Jan 30, 2023
d99f6d4
updates CI hash
Kiko-Aumond Jan 30, 2023
3d7bfcb
updated requirements
Kiko-Aumond Jan 30, 2023
8853407
updated requirements
Kiko-Aumond Jan 30, 2023
6eeac08
updated requirements
Kiko-Aumond Jan 30, 2023
9b42244
updated requirements
Kiko-Aumond Jan 30, 2023
fa6a757
undid requirement changes
Kiko-Aumond Jan 30, 2023
c6c1561
updated ci folder hash
Kiko-Aumond Jan 30, 2023
ed41b13
updated requirements
Kiko-Aumond Jan 30, 2023
7e076a0
updated requirements
Kiko-Aumond Jan 30, 2023
6316d3b
updated requirements
Kiko-Aumond Jan 30, 2023
9b943ca
updated requirements
Kiko-Aumond Jan 30, 2023
7fa7440
updated requirements
Kiko-Aumond Jan 30, 2023
a6a468f
updated requirements
Kiko-Aumond Jan 30, 2023
c880a18
updated requirements
Kiko-Aumond Jan 30, 2023
1f024d1
updated dependencies
Kiko-Aumond Jan 30, 2023
68d169f
updated requirements
Kiko-Aumond Jan 30, 2023
f2b8c73
updated dependencies
Kiko-Aumond Jan 30, 2023
ec88717
apt update
Kiko-Aumond Jan 30, 2023
3e4af46
fixed GCC download, set Ubuntu 20.04 as default OS for pipeline
Kiko-Aumond Jan 31, 2023
3fd1ad1
updated requirements
Kiko-Aumond Jan 31, 2023
5cb8de8
updated requirements
Kiko-Aumond Jan 31, 2023
17f2a7a
fixed setup.py
Kiko-Aumond Jan 31, 2023
3e1e2b4
updated ci hash
Kiko-Aumond Jan 31, 2023
9604db6
fixed setup.py
Kiko-Aumond Jan 31, 2023
bc9c7b7
fixed setup.py
Kiko-Aumond Jan 31, 2023
42b0881
fixed setup.py
Kiko-Aumond Jan 31, 2023
0b7d070
updated requirements
Kiko-Aumond Jan 31, 2023
5124b5d
fixed setup.py
Kiko-Aumond Jan 31, 2023
91df95f
force reintall of torch and torchvision
Kiko-Aumond Jan 31, 2023
8041c80
updated ci hash
Kiko-Aumond Jan 31, 2023
6cf662b
fixed rllib requirements
Kiko-Aumond Feb 1, 2023
1cf1948
updated requirements
Kiko-Aumond Feb 1, 2023
52683ff
updated requirements
Kiko-Aumond Feb 1, 2023
b90db59
updated requirements
Kiko-Aumond Feb 1, 2023
fb6bb23
updated requirements
Kiko-Aumond Feb 1, 2023
0e7ba4e
updated requirements
Kiko-Aumond Feb 1, 2023
feea4f5
updated requirements
Kiko-Aumond Feb 1, 2023
a6836af
updated dependencies
Kiko-Aumond Feb 1, 2023
1f33ba2
updated dependencies
Kiko-Aumond Feb 1, 2023
f965da8
updated requirements
Kiko-Aumond Feb 1, 2023
c268d44
updated requirements
Kiko-Aumond Feb 2, 2023
fe4a03f
updated requirements
Kiko-Aumond Feb 2, 2023
5ecffd4
explicitly set locale in MacOS to fix test_signal
Kiko-Aumond Feb 2, 2023
2323d34
keep only Ray Fork Build fixes
Kiko-Aumond Feb 3, 2023
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
38 changes: 18 additions & 20 deletions ci/azure_pipelines/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ parameters:
- name: ImageName
displayName: 'OS Image'
type: string
default: ubuntu-18.04
default: ubuntu-20.04
values:
- ubuntu-latest
- ubuntu-20.04
- ubuntu-18.04
- ubuntu-16.04

name: $(BuildDefinitionName)_$(SourceBranchName)_$(BuildID)
stages:
Expand All @@ -27,7 +25,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
Expand Down Expand Up @@ -123,7 +121,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
Expand Down Expand Up @@ -238,7 +236,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
# poolName: 'ADORayTests'
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
Expand Down Expand Up @@ -267,7 +265,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
# poolName: 'ADORayTests'
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
Expand Down Expand Up @@ -296,7 +294,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python37:
poolName: 'ADORayTests'
python.version: '3.7' # Atari_py does not support 3.8
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
Expand Down Expand Up @@ -369,7 +367,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
python36:
python38:
imageName: 'macOS-12'
python.version: '3.8'
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
Expand Down Expand Up @@ -465,7 +463,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
Expand Down Expand Up @@ -496,7 +494,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
Expand All @@ -523,7 +521,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
Expand All @@ -550,7 +548,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
Expand Down Expand Up @@ -579,7 +577,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
# poolName: 'ADORayTests'
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
Expand Down Expand Up @@ -637,7 +635,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
# poolName: 'ADORayTests'
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
Expand Down Expand Up @@ -666,7 +664,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
# poolName: 'ADORayTests'
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
Expand Down Expand Up @@ -699,7 +697,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
Expand All @@ -726,9 +724,9 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
poolName: ADORayTests
python.version: '3.7' # Atari_py does not support 3.8
python.version: '3.8'
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
TEST_TMPDIR: $(Agent.TempDirectory)
TRAVIS_OS_NAME: 'linux'
Expand All @@ -751,7 +749,7 @@ stages:
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
linux_python38:
imageName: ${{ parameters.ImageName }}
python.version: '3.8'
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
Expand Down
2 changes: 1 addition & 1 deletion ci/azure_pipelines/templates/info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ steps:
echo "Please check the changes, change the azure pipelines acordingly and update the sha256"
exit 1
fi
EXPECTED_HASH_CI_FOLDER='ffcdb528721bad0304a86dea1dc5a83687511bd3db9e6f03dd1010189c307135'
EXPECTED_HASH_CI_FOLDER='2ed411b09f5398ab5eaeffe81ca81a11ef335f9fdc71c2941ec4636a2431f0a0'
CURRENT_HASH_CI_FOLDER=$(find ./ci -path "./ci/azure_pipelines" -prune -o -path "./**/.DS_Store" -prune -o -type f -print0 | sort -z | xargs -0 shasum -a 256 | shasum -a 256 | awk '{print $1}')
if [[ $EXPECTED_HASH_CI_FOLDER != $CURRENT_HASH_CI_FOLDER ]]; then
echo "The original CI folder of the project has changed"
Expand Down
6 changes: 5 additions & 1 deletion ci/azure_pipelines/templates/ray-small-large.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ steps:
# TODO: [CI] remove after CI get stable
set -x
if [[ $AGENT_OS == "Darwin" ]]; then
export LANG=C LC_CTYPE=UTF-8
fi
# Set some variables to make the system looks like Travis
source $BUILD_SOURCESDIRECTORY/ci/azure_pipelines/templates/travis-legacy/pre-install.sh
Expand Down
15 changes: 11 additions & 4 deletions ci/azure_pipelines/templates/requirements-over-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,16 +185,25 @@ steps:

# Allow to debug the script
set -x

sudo apt-get update

export DEBIAN_FRONTEND=noninteractive
sudo apt-get install -yq \
--allow-downgrades --allow-remove-essential --allow-change-held-packages \
--no-install-recommends \
"clang-format-$version" \
lsb-release \
wget \
software-properties-common \
gnupg

# Install gcc
function InstallClang {
version=$1

echo "Installing clang-$version..."
if [[ $version =~ 9 ]]; then
sudo ./llvm.sh $version
sudo ./llvm.sh $version -n focal
sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq \
--allow-downgrades --allow-remove-essential --allow-change-held-packages \
--no-install-recommends \
Expand Down Expand Up @@ -227,8 +236,6 @@ steps:
chmod +x llvm.sh

versions=(
"6.0"
"8"
"9"
)

Expand Down
1 change: 1 addition & 0 deletions ci/azure_pipelines/templates/rlib-quick-train-tf-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ steps:

# install part
. ./ci/travis/ci.sh init RAY_CI_RLLIB_FULL_AFFECTED
sudo chmod -R 777 $TEST_TMPDIR
. ./ci/travis/ci.sh build

# script part
Expand Down
2 changes: 1 addition & 1 deletion ci/travis/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ install_ray() {
(
cd "${WORKSPACE_DIR}"/python
build_dashboard_front_end
pip install --force-reinstall -v -e .
pip install -v -e .
)
}

Expand Down
32 changes: 18 additions & 14 deletions ci/travis/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -329,13 +329,8 @@ install_dependencies() {
if [ -n "${PYTHON-}" ]; then
# Remove this entire section once RLlib and Serve dependencies are fixed.
if [ "${DOC_TESTING-}" != 1 ] && [ "${SGD_TESTING-}" != 1 ] && [ "${TUNE_TESTING-}" != 1 ]; then
# PyTorch is installed first since we are using a "-f" directive to find the wheels.
# We want to install the CPU version only.
local torch_url="https://download.pytorch.org/whl/torch_stable.html"
case "${OSTYPE}" in
darwin*) pip install torch==1.8.1 torchvision==0.9.1;;
*) pip install torch==1.8.1+cpu torchvision==0.9.1+cpu -f "${torch_url}";;
esac
pip install --upgrade-strategy only-if-needed torch==1.8.1 torchvision==0.9.1
pip freeze
fi

pip install --upgrade pip==20.3.4
Expand All @@ -346,9 +341,12 @@ install_dependencies() {
local status="0";
local errmsg="";
for _ in {1..3}; do
errmsg=$(CC=gcc pip install --default-timeout=100 -r "${WORKSPACE_DIR}"/python/requirements.txt 2>&1) && break;
errmsg=$(CC=gcc pip install --default-timeout=100 --upgrade-strategy only-if-needed -r "${WORKSPACE_DIR}"/python/requirements.txt 2>&1) && break;
status=$errmsg && echo "'pip install ...' failed, will retry after n seconds!" && sleep 30;
done

pip freeze

if [ "$status" != "0" ]; then
echo "${status}" && return 1
fi
Expand All @@ -371,19 +369,22 @@ install_dependencies() {

# Additional RLlib test dependencies.
if [ "${RLLIB_TESTING-}" = 1 ]; then
pip install -r "${WORKSPACE_DIR}"/python/requirements_rllib.txt
pip install --upgrade-strategy only-if-needed -r "${WORKSPACE_DIR}"/python/requirements_rllib.txt
# install the following packages for testing on travis only
pip install 'recsim>=0.2.4'
pip install --upgrade-strategy only-if-needed 'recsim==0.2.4'
pip freeze
fi

# Additional Tune/SGD/Doc test dependencies.
if [ "${TUNE_TESTING-}" = 1 ] || [ "${SGD_TESTING-}" = 1 ] || [ "${DOC_TESTING-}" = 1 ]; then
pip install -r "${WORKSPACE_DIR}"/python/requirements/requirements_tune.txt
pip install --upgrade-strategy only-if-needed -r "${WORKSPACE_DIR}"/python/requirements/requirements_tune.txt
pip freeze
fi

# For Tune, install upstream dependencies.
if [ "${TUNE_TESTING-}" = 1 ] || [ "${DOC_TESTING-}" = 1 ]; then
pip install -r "${WORKSPACE_DIR}"/python/requirements/requirements_upstream.txt
pip install --upgrade-strategy only-if-needed -r "${WORKSPACE_DIR}"/python/requirements/requirements_upstream.txt
pip freeze
fi

# Remove this entire section once RLlib and Serve dependencies are fixed.
Expand All @@ -399,9 +400,10 @@ install_dependencies() {
1.5) TORCHVISION_VERSION=0.6.0;;
*) TORCHVISION_VERSION=0.5.0;;
esac
pip install --use-deprecated=legacy-resolver --upgrade tensorflow-probability=="${TFP_VERSION-0.11.1}" \
pip install --upgrade-strategy only-if-needed --upgrade tensorflow-probability=="${TFP_VERSION-0.11.1}" \
torch=="${TORCH_VERSION-1.7}" torchvision=="${TORCHVISION_VERSION}" \
tensorflow=="${TF_VERSION-2.5.0}" gym=="0.18.0"
tensorflow=="${TF_VERSION-2.5.0}" gym=="0.18.0" atari-py==0.2.5
pip freeze
fi
fi

Expand All @@ -418,6 +420,8 @@ install_dependencies() {
fi

CC=gcc pip install psutil setproctitle==1.2.2 --target="${WORKSPACE_DIR}/python/ray/thirdparty_files"

pip freeze
}

install_dependencies "$@"
Expand Down
Loading