Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
cfdb97f
Add basic Job class, and PBS implementation
mrocklin Aug 5, 2019
7fde000
add pytest-asyncio and fix pbs test
mrocklin Aug 6, 2019
a49ac2a
Add SGEJob with passing test.
lesteve Aug 6, 2019
86261f4
Rewrite the test to be dask 2.2.0 compatible.
lesteve Aug 6, 2019
3fdfd57
Add basic JobQueueCluster SpecCluster implementation
mrocklin Aug 6, 2019
91ad132
black
mrocklin Aug 6, 2019
d67e484
Add test for initial scale
mrocklin Aug 6, 2019
146555f
Fix name / job_name.
lesteve Aug 6, 2019
83f832a
add names to cluster tests
mrocklin Aug 7, 2019
e520e21
Add echo into job script template
mrocklin Aug 7, 2019
c07133d
Revert "Add echo into job script template"
mrocklin Aug 7, 2019
3ddd0b2
improve job-name
mrocklin Aug 7, 2019
6f81aec
black
mrocklin Aug 7, 2019
370ea47
cleanup jobname
mrocklin Aug 7, 2019
e7bc03b
get debug information for tests in sge
mrocklin Aug 7, 2019
9cdac92
pass through `*args`
mrocklin Aug 7, 2019
09e4d6f
cleanup sge test
mrocklin Aug 7, 2019
f5c86eb
test scale down
mrocklin Aug 7, 2019
4b71826
parametrize tests
mrocklin Aug 7, 2019
6b554ab
cleanup tests
mrocklin Aug 7, 2019
cada8a8
close job with weakref.finalize
mrocklin Aug 7, 2019
1d70a19
Add SLURMJob
mrocklin Aug 10, 2019
2545ebc
Add test for adaptive
mrocklin Aug 10, 2019
dae702d
fixup adaptive tests
mrocklin Aug 10, 2019
043888b
black
mrocklin Aug 10, 2019
f3974bb
close job in test_job
mrocklin Aug 10, 2019
abcb4e1
Also wait for workers in test
mrocklin Aug 11, 2019
5a709c0
add dask/distributed git master to CI
mrocklin Aug 13, 2019
5f15386
Merge branch 'master' into spec-rewrite
mrocklin Aug 18, 2019
9b0b0f8
Relax test_slurm.py to not check jobs attributes
mrocklin Aug 19, 2019
1443435
Replace SLURMCluster with new variant
mrocklin Aug 20, 2019
4464034
Merge branch 'spec-rewrite' of github.com:mrocklin/dask-jobqueue into…
mrocklin Aug 20, 2019
29dfccb
update tests
mrocklin Aug 20, 2019
152d8e4
remove SLURMCluster from another test
mrocklin Aug 21, 2019
87d33f4
move around functions in slurm.py
mrocklin Aug 21, 2019
c5ac573
SGECluster now uses SpecCluster.
lesteve Aug 22, 2019
f3847e0
Two more fixes now that ._job_id_from_submit_output has moved to the …
lesteve Aug 22, 2019
1ff904d
silence logs by default
mrocklin Aug 22, 2019
afe8e9e
bump requirements
mrocklin Aug 22, 2019
eaf0b11
Merge branch 'spec-rewrite' of github.com:mrocklin/dask-jobqueue into…
mrocklin Aug 22, 2019
95f00ac
add config_name to JobQueueCluster
mrocklin Aug 25, 2019
1911861
Move repr functionality upstream to Cluster.__repr__
mrocklin Aug 25, 2019
716dd40
move pbs and moab
mrocklin Aug 25, 2019
1f20681
move over LSF
mrocklin Aug 25, 2019
172ecd4
Add header_skip option to Job constructor
mrocklin Aug 25, 2019
9bf286a
simplify bsub management in lsf
mrocklin Aug 25, 2019
f91bec2
add nanny keyword
mrocklin Aug 26, 2019
6db1366
remove docstring wrapping in LSF for now
mrocklin Aug 26, 2019
f523cb5
black + flake8
mrocklin Aug 26, 2019
00352ac
cleanup pbs testing
mrocklin Aug 26, 2019
1b0e212
typo
mrocklin Aug 26, 2019
5eda238
move Cluster.example_job down to a property
mrocklin Aug 26, 2019
e10ce60
verify that we can create a Job on instantiation
mrocklin Aug 26, 2019
5b8cb14
cleanup pbs tests
mrocklin Aug 26, 2019
50340d5
make hanging slurm test verbose
mrocklin Aug 26, 2019
7539234
Add LocalJob for testing
mrocklin Aug 27, 2019
01481bf
Add empty jobs to fill out worker spec with many processes
mrocklin Aug 28, 2019
3f81a99
cleanup new_worker_spec
mrocklin Aug 28, 2019
5c97395
add distributed master to CI for none
mrocklin Aug 28, 2019
44f0120
Update multi-job work for upstream PR
mrocklin Aug 29, 2019
9d3e181
remove errant shell=True keyword
mrocklin Aug 29, 2019
50d4439
Merge branch 'master' of github.com:dask/dask-jobqueue into spec-rewrite
mrocklin Aug 29, 2019
2ac776c
relax Cluster name test, add status
mrocklin Aug 29, 2019
875ce5f
copy over cores=, memory= error message from master
mrocklin Aug 29, 2019
fbbfc4b
add -s to pbs test
mrocklin Aug 29, 2019
a92d0ff
ignore Runtime Errors when closing jobs
mrocklin Aug 29, 2019
0a338f7
Friday afternoon semi random attempt.
lesteve Aug 30, 2019
db5c397
Same attempt with PBS. Does two half-random attempts make a complete …
lesteve Aug 30, 2019
b73ccb0
dask-worker could not start because run as pbsuser in /.
lesteve Aug 30, 2019
4ea85e8
Remove .runnin_jobs.
lesteve Aug 30, 2019
0789ed9
Fix cluster -> client
lesteve Aug 30, 2019
2215227
get worker_processes from example job
mrocklin Aug 31, 2019
6de262e
black
mrocklin Aug 31, 2019
f64c3e8
Move over Oar
mrocklin Aug 31, 2019
860b851
move over htcondor
mrocklin Aug 31, 2019
512b766
remove old core and deploy code
mrocklin Aug 31, 2019
2014f02
Avoid modifying config value in place
mrocklin Sep 1, 2019
f2be218
Use subclasses for FooClusters rather than functools.partial
mrocklin Sep 8, 2019
195c707
Add docstrings
mrocklin Sep 8, 2019
fccd895
Remove docrep and core.py
mrocklin Sep 8, 2019
f3ee152
remove errant breakpoint
mrocklin Sep 8, 2019
5ec910e
flake8 and black
mrocklin Sep 8, 2019
3ad195d
xfail minimum/maximum cores/memory test
mrocklin Sep 9, 2019
9deb3bd
Small tweaks and TODO.
lesteve Sep 10, 2019
34bece8
Job -> job_cls
mrocklin Sep 11, 2019
6b394e3
remove spacing around job/cluster parametrers
mrocklin Sep 11, 2019
faef618
black
mrocklin Sep 11, 2019
d90cc53
remove LocalFoo from __init__.py
mrocklin Sep 12, 2019
fa629af
Remove Job classes from __init__.py
mrocklin Sep 12, 2019
bece3e4
lint
mrocklin Sep 12, 2019
eef7334
Raise error in LocalJob if failure
mrocklin Sep 12, 2019
7d13e6b
Remove some TODOs
mrocklin Sep 13, 2019
a1d1343
Remove None check for job_id.
lesteve Sep 13, 2019
e1f2e20
Some tweaks.
lesteve Sep 13, 2019
ccfe946
Fine to have header_skip in the PR.
lesteve Sep 13, 2019
ddb692f
Move job.py to core.py
mrocklin Sep 13, 2019
21965e2
Add <insert-scheduler-address-here> into example_job address
mrocklin Sep 13, 2019
6f6e3d2
add changelog entry
mrocklin Sep 16, 2019
0b21d28
example_job -> _dummy_job
mrocklin Sep 17, 2019
b9c24c0
Add scale/adapt memory/cores to docs
mrocklin Sep 17, 2019
79d108b
specify jobs= keyword in scale
mrocklin Sep 25, 2019
7809511
Support jobs= keyword in scale
mrocklin Sep 25, 2019
4a0c626
Add minimum/maximum_jobs to adapt
mrocklin Sep 25, 2019
289915f
lint
mrocklin Sep 25, 2019
bf4840b
unxfail adaptive cores/memory pbs test
mrocklin Sep 25, 2019
18cd5cd
Remove startup_cost keyword from HTCondor docstring
mrocklin Sep 25, 2019
e2b7cb5
await clusters before closing
mrocklin Sep 25, 2019
dd2db2d
reduce core count in test
mrocklin Sep 25, 2019
9b11c65
update docstrings to use the jobs= parameter
mrocklin Sep 25, 2019
38c4c3d
update docs
mrocklin Sep 25, 2019
23562a4
two more small doc fixes [skip ci]
mrocklin Sep 25, 2019
18660e6
Change comment that I do not understand.
lesteve Sep 25, 2019
55aca3a
Use .scale(jobs=...) in doc and remove invalid changelog entry.
lesteve Sep 25, 2019
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
3 changes: 2 additions & 1 deletion ci/none.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ function jobqueue_before_install {
# Install miniconda
./ci/conda_setup.sh
export PATH="$HOME/miniconda/bin:$PATH"
conda install --yes -c conda-forge python=$TRAVIS_PYTHON_VERSION dask distributed flake8 black pytest docrep
conda install --yes -c conda-forge python=$TRAVIS_PYTHON_VERSION dask distributed flake8 black pytest pytest-asyncio
pip install git+https://github.com/dask/distributed@master --upgrade --no-deps
}

function jobqueue_install {
Expand Down
2 changes: 1 addition & 1 deletion ci/pbs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function jobqueue_install {
}

function jobqueue_script {
docker exec -it -u pbsuser pbs_master /bin/bash -c "cd /dask-jobqueue; pytest dask_jobqueue --verbose -E pbs"
docker exec -it -u pbsuser pbs_master /bin/bash -c "cd; pytest /dask-jobqueue/dask_jobqueue --verbose -s -E pbs"
}

function jobqueue_after_script {
Expand Down
3 changes: 2 additions & 1 deletion ci/pbs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ RUN curl -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-L
bash miniconda.sh -f -b -p /opt/anaconda && \
/opt/anaconda/bin/conda clean -tipy && \
rm -f miniconda.sh
RUN conda install --yes -c conda-forge python=3.6 dask distributed flake8 pytest docrep
RUN conda install --yes -c conda-forge python=3.6 dask distributed flake8 pytest pytest-asyncio
RUN pip install git+https://github.com/dask/distributed --upgrade --no-deps

# Copy entrypoint and other needed scripts
COPY ./*.sh /
Expand Down
2 changes: 1 addition & 1 deletion ci/sge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function jobqueue_install {
}

function jobqueue_script {
docker exec -it sge_master /bin/bash -c "cd /dask-jobqueue; pytest dask_jobqueue --verbose -E sge"
docker exec -it sge_master /bin/bash -c "cd /dask-jobqueue; pytest dask_jobqueue --verbose -s -E sge"
}

function jobqueue_after_script {
Expand Down
3 changes: 2 additions & 1 deletion ci/sge/Dockerfile-master
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ RUN curl -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-L
rm -f miniconda.sh
ENV PATH /opt/anaconda/bin:$PATH
ARG PYTHON_VERSION
RUN conda install -c conda-forge python=$PYTHON_VERSION dask distributed pytest && conda clean -tipy
RUN conda install -c conda-forge python=$PYTHON_VERSION dask distributed pytest pytest-asyncio && conda clean -tipy
RUN pip install git+https://github.com/dask/distributed --upgrade --no-deps

COPY ./*.sh /
COPY ./*.txt /
Expand Down
3 changes: 2 additions & 1 deletion ci/sge/Dockerfile-slave
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ RUN curl -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-L
rm -f miniconda.sh
ENV PATH /opt/anaconda/bin:$PATH
ARG PYTHON_VERSION
RUN conda install -c conda-forge python=$PYTHON_VERSION dask distributed pytest && conda clean -tipy
RUN conda install -c conda-forge python=$PYTHON_VERSION dask distributed pytest pytest-asyncio && conda clean -tipy
RUN pip install git+https://github.com/dask/distributed --upgrade --no-deps

COPY ./setup-slave.sh /
COPY ./*.sh /
Expand Down
2 changes: 1 addition & 1 deletion ci/slurm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function jobqueue_install {
}

function jobqueue_script {
docker exec -it slurmctld /bin/bash -c "cd /dask-jobqueue; pytest dask_jobqueue --verbose -E slurm"
docker exec -it slurmctld /bin/bash -c "pytest /dask-jobqueue/dask_jobqueue --verbose -E slurm -s"
}

function jobqueue_after_script {
Expand Down
3 changes: 2 additions & 1 deletion ci/slurm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ RUN curl -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-L
/opt/anaconda/bin/conda clean -tipy && \
rm -f miniconda.sh
ENV PATH /opt/anaconda/bin:$PATH
RUN conda install --yes -c conda-forge python=3.6 dask distributed flake8 pytest docrep
RUN conda install --yes -c conda-forge python=3.6 dask distributed flake8 pytest pytest-asyncio
RUN pip install git+https://github.com/dask/distributed --upgrade --no-deps

ENV LC_ALL en_US.UTF-8

Expand Down
Loading