Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
ToolBox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SCS
ToolBox
Commits
2b747f8b
Commit
2b747f8b
authored
3 years ago
by
Cammille Carinan
Browse files
Options
Downloads
Patches
Plain Diff
Add dask as dependency
parent
d3251794
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!155
Add dask as dependency
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/index.rst
+1
-0
1 addition, 0 deletions
doc/index.rst
doc/maintainers.rst
+90
-0
90 additions, 0 deletions
doc/maintainers.rst
setup.py
+3
-2
3 additions, 2 deletions
setup.py
with
94 additions
and
2 deletions
doc/index.rst
+
1
−
0
View file @
2b747f8b
...
@@ -108,6 +108,7 @@ Documentation contents
...
@@ -108,6 +108,7 @@ Documentation contents
:maxdepth: 2
:maxdepth: 2
howtos.rst
howtos.rst
maintainers.rst
Contribute
Contribute
...
...
This diff is collapsed.
Click to expand it.
doc/maintainers.rst
0 → 100644
+
90
−
0
View file @
2b747f8b
.. _maintainers:
Maintainers
~~~~~~~~~~~
Creating a Toolbox environment in the proposal folder
-----------------------------------------------------
A Toolbox environment can be created by running the following commands
in Maxwell:
.. code::shell
module exfel exfel_anaconda3
scs-create-toolbox-env --proposal <PROPOSAL>
where ``<PROPOSAL>`` is the desired proposal number. This will create a Python
environment and will download and install the Toolbox source code. It will
result to the creation of the following folders in the path
``<PROPOSAL_PATH>/usr/Software``.
.. code-block::
<PROPOSAL_PATH>/usr/Software/
├─ checkouts/
│ ├─ toolbox_<PROPOSAL>/
│ │ ├─ <source code>
├─ envs/
│ ├─ toolbox_<PROPOSAL>/
│ │ ├─ <Python files>
The ``checkouts`` folder contains the Toolbox source codes, correspondingly
labeled according to the environment identifier, which is the proposal number
by default. The downloaded code defaults to the **master** version at the
time when the environment is created.
The ``envs`` folder contains the Python environment with the packages necessary
to run the Toolbox. It is also correspondingly labeled according to the
environment identifier, which is the proposal number by default.
.. note::
One can find the proposal path by running ``find-proposal <PROPOSAL>``.
It is a good practice to tag the Toolbox version at a given milestone.
This version can be then supplied to the script as:
.. code:: shell
scs-create-toolbox-env --proposal <PROPOSAL> --version <VERSION>
It might also be helpful to supply an identifier to distinguish environments
from each other. This can be done by running:
.. code:: shell
scs-create-toolbox-env --proposal <PROPOSAL> --identifier <IDENTIFIER>
The environment would then be identified as ``toolbox_<IDENTIFIER>`` instead
of ``toolbox_<PROPOSAL>``.
Installing additional packages
------------------------------
In order to install additional packages in a Toolbox environment, one should
run the following commands:
.. code::shell
cd <PROPOSAL_PATH>/usr/Software/
source envs/toolbox_<IDENTIFIER>/bin/activate
pip install ...
There's no need to load the ``exfel`` module.
Updating the source codes
--------------------------
Should there be desired changes in the Toolbox codes, may it be bug fixes or
additional features during beamtime, one can freely modify the source codes in
the following path: ``<PROPOSAL_PATH>/usr/Software/checkouts/toolbox_<IDENTIFIER>``.
The contents of this folder should be a normal git repository. Any changes can
be easily done (e.g., editing a line of code, checking out a different
branch, etc.) and such changes are immediately reflected on the environment.
This diff is collapsed.
Click to expand it.
setup.py
+
3
−
2
View file @
2b747f8b
...
@@ -10,9 +10,10 @@ with open('VERSION') as f:
...
@@ -10,9 +10,10 @@ with open('VERSION') as f:
basic_analysis_reqs
=
[
'
numpy
'
,
'
scipy
'
,]
# and is readily available in Karabo
basic_analysis_reqs
=
[
'
numpy
'
,
'
scipy
'
,]
# and is readily available in Karabo
advanced_analysis_reqs
=
[
advanced_analysis_reqs
=
[
'
pandas
'
,
'
imageio
'
,
'
xarray>=0.13.0
'
,
'
h5py
'
,
'
h5netcdf
'
,]
'
pandas
'
,
'
imageio
'
,
'
xarray>=0.13.0
'
,
'
psutil
'
,
'
h5py
'
,
'
h5netcdf
'
,]
interactive_reqs
=
[
'
ipykernel
'
,
'
matplotlib
'
,
'
tqdm
'
,]
interactive_reqs
=
[
'
ipykernel
'
,
'
matplotlib
'
,
'
tqdm
'
,]
maxwell_reqs
=
[
'
joblib
'
,
'
papermill
'
,
'
extra_data
'
,
'
euxfel_bunch_pattern>=0.6
'
]
maxwell_reqs
=
[
'
joblib
'
,
'
papermill
'
,
'
dask
'
,
'
extra_data
'
,
'
euxfel_bunch_pattern>=0.6
'
]
setup
(
name
=
'
toolbox_scs
'
,
setup
(
name
=
'
toolbox_scs
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment