Skip to content

Commit d67bcc1

Browse files
committed
CI remove ccache
1 parent 51ef0fd commit d67bcc1

File tree

4 files changed

+12
-84
lines changed

4 files changed

+12
-84
lines changed

.travis.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

build_tools/azure/install.sh

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,6 @@ make_conda() {
1616
source activate $VIRTUALENV
1717
}
1818

19-
setup_ccache() {
20-
echo "Setting up ccache"
21-
mkdir /tmp/ccache/
22-
which ccache
23-
for name in gcc g++ cc c++ x86_64-linux-gnu-gcc x86_64-linux-gnu-c++; do
24-
ln -s $(which ccache) "/tmp/ccache/${name}"
25-
done
26-
export PATH="/tmp/ccache/:${PATH}"
27-
ccache -M 256M
28-
}
29-
3019
# imports get_dep
3120
source build_tools/shared.sh
3221

@@ -39,7 +28,7 @@ if [[ "$DISTRIB" == "conda" || "$DISTRIB" == *"mamba"* ]]; then
3928
fi
4029

4130
TO_INSTALL="$TO_INSTALL python=$PYTHON_VERSION"
42-
TO_INSTALL="$TO_INSTALL ccache pip blas[build=$BLAS]"
31+
TO_INSTALL="$TO_INSTALL pip blas[build=$BLAS]"
4332

4433
TO_INSTALL="$TO_INSTALL $(get_dep numpy $NUMPY_VERSION)"
4534
TO_INSTALL="$TO_INSTALL $(get_dep scipy $SCIPY_VERSION)"
@@ -50,90 +39,77 @@ if [[ "$DISTRIB" == "conda" || "$DISTRIB" == *"mamba"* ]]; then
5039
TO_INSTALL="$TO_INSTALL $(get_dep matplotlib $MATPLOTLIB_VERSION)"
5140

5241
make_conda $TO_INSTALL
53-
setup_ccache
5442

5543
elif [[ "$DISTRIB" == "ubuntu" ]]; then
5644
sudo add-apt-repository --remove ppa:ubuntu-toolchain-r/test
5745
sudo apt-get update
5846
sudo apt-get install python3-scipy python3-sklearn python3-matplotlib \
59-
libatlas3-base libatlas-base-dev python3-virtualenv ccache
47+
libatlas3-base libatlas-base-dev python3-virtualenv
6048
python3 -m virtualenv --system-site-packages --python=python3 $VIRTUALENV
6149
source $VIRTUALENV/bin/activate
62-
setup_ccache
6350
python -m pip install $(get_dep joblib $JOBLIB_VERSION)
6451

6552
elif [[ "$DISTRIB" == "debian-32" ]]; then
6653
apt-get update
6754
apt-get install -y python3-dev python3-numpy python3-scipy python3-sklearn \
6855
python3-matplotlib libatlas3-base libatlas-base-dev python3-virtualenv \
69-
python3-pandas ccache
56+
python3-pandas
7057

7158
python3 -m virtualenv --system-site-packages --python=python3 $VIRTUALENV
7259
source $VIRTUALENV/bin/activate
73-
setup_ccache
7460
python -m pip install $(get_dep joblib $JOBLIB_VERSION)
7561

7662
elif [[ "$DISTRIB" == "conda-pip-latest" ]]; then
7763
# Since conda main channel usually lacks behind on the latest releases,
7864
# we use pypi to test against the latest releases of the dependencies.
7965
# conda is still used as a convenient way to install Python and pip.
80-
make_conda "ccache python=$PYTHON_VERSION"
81-
setup_ccache
66+
make_conda "python=$PYTHON_VERSION"
8267
python -m pip install -U pip
8368

8469
python -m pip install scikit-learn pandas matplotlib
8570

8671
elif [[ "$DISTRIB" == "conda-pip-latest-tensorflow" ]]; then
87-
make_conda "ccache python=$PYTHON_VERSION"
88-
setup_ccache
72+
make_conda "python=$PYTHON_VERSION"
8973
python -m pip install -U pip
9074

9175
python -m pip install numpy scipy scikit-learn pandas tensorflow
9276

9377
elif [[ "$DISTRIB" == "conda-latest-tensorflow" ]]; then
94-
make_conda "ccache python=$PYTHON_VERSION numpy scipy scikit-learn pandas tensorflow"
95-
setup_ccache
78+
make_conda " python=$PYTHON_VERSION numpy scipy scikit-learn pandas tensorflow"
9679

9780
elif [[ "$DISTRIB" == "conda-minimum-tensorflow" ]]; then
98-
TO_INSTALL="ccache "
99-
TO_INSTALL="$TO_INSTALL python=$PYTHON_VERSION"
81+
TO_INSTALL="$python=$PYTHON_VERSION"
10082
TO_INSTALL="$TO_INSTALL $(get_dep numpy $NUMPY_VERSION)"
10183
TO_INSTALL="$TO_INSTALL $(get_dep scipy $SCIPY_VERSION)"
10284
TO_INSTALL="$TO_INSTALL $(get_dep scikit-learn $SKLEARN_VERSION)"
10385
TO_INSTALL="$TO_INSTALL $(get_dep pandas $PANDAS_VERSION)"
10486
TO_INSTALL="$TO_INSTALL $(get_dep tensorflow $TENSORFLOW_VERSION)"
10587
make_conda $TO_INSTALL
106-
setup_ccache
10788

10889
elif [[ "$DISTRIB" == "conda-pip-latest-keras" ]]; then
109-
make_conda "ccache python=$PYTHON_VERSION"
110-
setup_ccache
90+
make_conda "=$PYTHON_VERSION"
11191
python -m pip install -U pip
11292

11393
python -m pip install numpy scipy scikit-learn pandas keras
11494

11595
elif [[ "$DISTRIB" == "conda-latest-keras" ]]; then
116-
make_conda "ccache python=$PYTHON_VERSION numpy scipy scikit-learn pandas keras"
117-
setup_ccache
96+
make_conda "=$PYTHON_VERSION numpy scipy scikit-learn pandas keras"
11897

11998
elif [[ "$DISTRIB" == "conda-minimum-keras" ]]; then
120-
TO_INSTALL="ccache "
121-
TO_INSTALL="$TO_INSTALL python=$PYTHON_VERSION"
99+
TO_INSTALL="=$PYTHON_VERSION"
122100
TO_INSTALL="$TO_INSTALL $(get_dep numpy $NUMPY_VERSION)"
123101
TO_INSTALL="$TO_INSTALL $(get_dep scipy $SCIPY_VERSION)"
124102
TO_INSTALL="$TO_INSTALL $(get_dep scikit-learn $SKLEARN_VERSION)"
125103
TO_INSTALL="$TO_INSTALL $(get_dep pandas $PANDAS_VERSION)"
126104
TO_INSTALL="$TO_INSTALL $(get_dep keras $KERAS_VERSION)"
127105
make_conda $TO_INSTALL
128-
setup_ccache
129106

130107
elif [[ "$DISTRIB" == "conda-pip-scipy-dev" ]]; then
131-
make_conda "ccache python=$PYTHON_VERSION"
108+
make_conda "=$PYTHON_VERSION"
132109
python -m pip install -U pip
133110
echo "Installing numpy and scipy master wheels"
134111
dev_anaconda_url=https://pypi.anaconda.org/scipy-wheels-nightly/simple
135112
pip install --pre --upgrade --timeout=60 --extra-index $dev_anaconda_url numpy pandas scipy scikit-learn
136-
setup_ccache
137113
echo "Installing joblib master"
138114
pip install https://github.com/joblib/joblib/archive/master.zip
139115
echo "Installing tensorflow master"
@@ -171,4 +147,3 @@ except ImportError:
171147

172148
python -m pip list
173149
pip install --verbose --editable .
174-
ccache -s

build_tools/azure/posix.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
CPU_COUNT: '2'
2222
SKLEARN_SKIP_NETWORK_TESTS: '1'
2323
SKLEARN_DATA_DIR: $(System.DefaultWorkingDirectory)/scikit_learn_data
24-
CCACHE_DIR: $(Pipeline.Workspace)/ccache
25-
CCACHE_COMPRESS: '1'
2624
NUMPY_VERSION: 'latest'
2725
SCIPY_VERSION: 'latest'
2826
SKLEARN_VERSION: 'latest'
@@ -56,12 +54,6 @@ jobs:
5654
path: $(SKLEARN_DATA_DIR)
5755
displayName: Dataset caching
5856
continueOnError: true
59-
- task: Cache@2
60-
inputs:
61-
key: '"$(Agent.JobName)"'
62-
path: $(CCACHE_DIR)
63-
displayName: ccache
64-
continueOnError: true
6557
- script: |
6658
build_tools/azure/install.sh
6759
displayName: 'Install'

build_tools/circle/build_doc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ sudo -E apt-get -yq remove texlive-binaries --purge
8282
sudo -E apt-get -yq --no-install-suggests --no-install-recommends \
8383
install dvipng texlive-latex-base texlive-latex-extra \
8484
texlive-latex-recommended texlive-fonts-recommended \
85-
latexmk gsfonts ccache zip optipng
85+
latexmk gsfonts zip optipng
8686

8787
# deactivate circleci virtualenv and setup a miniconda env instead
8888
if [[ `type -t deactivate` ]]; then

0 commit comments

Comments
 (0)