Skip to content

Commit 0948855

Browse files
authored
Merge pull request #315 from branfosj/removals
Removals
2 parents 6f919b1 + adbf943 commit 0948855

File tree

3 files changed

+13
-142
lines changed

3 files changed

+13
-142
lines changed

Diff for: docs/configuration.md

+5-123
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Configuring EasyBuild {: #configuring_easybuild }
22

3-
This page discusses the recommended style of configuring
4-
EasyBuild, which is supported since EasyBuild v1.3.0.
3+
This page discusses the recommended style of configuring EasyBuild.
54

65
See [a demo on configuring EasyBuild][demo_configuring].
76

@@ -82,8 +81,7 @@ configuration files at `/etc/easybuild.d/*.cfg` and `$HOME/.config/easybuild/con
8281
The configuration file located in `$XDG_CONFIG_HOME` will be listed *after* the ones obtained via `$XDG_CONFIG_DIRS`,
8382
such that user-defined configuration settings have preference over system defaults.
8483

85-
A detailed overview of the list of default configuration files is available via `eb --show-default-configfiles`
86-
(available since EasyBuild v2.1.0). For example::
84+
A detailed overview of the list of default configuration files is available via `eb --show-default-configfiles`. For example:
8785

8886
``` console
8987
$ XDG_CONFIG_DIRS=/tmp/etc:/tmp/moreetc eb --show-default-configfiles
@@ -184,7 +182,7 @@ See also [Controlling the robot search path][controlling_robot_search_path].
184182

185183
#### Generating a template configuration file
186184

187-
Since EasyBuild v1.10, a command line option `--confighelp` is
185+
A command line option `--confighelp` is
188186
available that prints out the help text as an annotated configuration
189187
file. This can be used as an empty template configuration file:
190188

@@ -316,28 +314,7 @@ A couple of selected configuration settings are discussed below,
316314
in particular the mandatory settings.
317315

318316

319-
### Mandatory configuration settings {: #configuration_mandatory_settings }
320-
321-
A handful of configuration settings are **mandatory**, and should be
322-
provided using one of the supported configuration types.
323-
324-
The following configuration settings are currently mandatory
325-
(more details in the sections below):
326-
327-
* [Source path (--sourcepath)][sourcepath]
328-
* [Build path (--buildpath)][buildpath]
329-
* [Software and modules install path (--installpath, --installpath-software, --installpath-modules)][installpath]
330-
* [Easyconfigs repository (--repository, --repositorypath)][easyconfigs_repo]
331-
* [Logfile format (--logfile-format)][logfile_format]
332-
333-
334-
If any of these configuration settings is not provided in one way or another, EasyBuild will complain and exit.
335-
336-
In practice, all of these have reasonable defaults (see `eb --help` for the default settings).
337-
338-
!!! note
339-
The mandatory path-related options can be tweaked collectively via `--prefix`, see [Overall prefix path (`--prefix`)][prefix] for more
340-
information.
317+
### Important configuration settings {: #important_configuration_settings }
341318

342319
#### Source path (`--sourcepath`) {: #sourcepath }
343320

@@ -379,7 +356,7 @@ when the installation is completed (by default).
379356
Using `/dev/shm` as build path can significantly speed up builds,
380357
if it is available and provides a sufficient amount of space. Setting up
381358
the variable `EASYBUILD_BUILDPATH` in your shell startup files makes this default.
382-
However be aware that, fi., two parallel GCC builds may fill up `/dev/shm` !
359+
However be aware that multiple parallel builds may fill up `/dev/shm` !
383360

384361

385362
#### Software and modules install path {: #installpath }
@@ -463,101 +440,6 @@ so you do not need to adjust `$MODULEPATH` every time you start a new session.
463440
runtime according to the modules install path it is configured with.
464441

465442

466-
#### Easyconfigs repository (`--repository`, `--repositorypath`) {: #easyconfigs_repo }
467-
468-
*default*: `FileRepository` at `$HOME/.local/easybuild/ebfiles_repo`
469-
(determined via [Overall prefix path (`--prefix`)][prefix])
470-
471-
EasyBuild has support for archiving (tested) `.eb` easyconfig files.
472-
After successfully installing a software package using EasyBuild, the
473-
corresponding `.eb` file is uploaded to a repository defined by the
474-
`repository` and `repositorypath` configuration settings.
475-
476-
Currently, EasyBuild supports the following repository types (see also
477-
`eb --avail-repositories`):
478-
479-
* `FileRepository('path', 'subdir')`: a plain flat file repository;
480-
`path` is the path where files will be stored, `subdir` is an
481-
*optional* subdirectory of that path where the files should be stored
482-
* `GitRepository('path', 'subdir/in/repo'`: a *non-empty* **bare**
483-
git repository (created with `git init --bare` or `git clone --bare`);
484-
`path` is the path to the git repository (can also be a URL);
485-
`subdir/in/repo` is optional, and specifies a subdirectory of the
486-
repository where files should be stored in
487-
* `SvnRepository('path', 'subdir/in/repo')`: an SVN repository;
488-
`path` contains the subversion repository location (directory or
489-
URL), the optional second value specifies a subdirectory in the repository
490-
491-
You need to set the `repository` setting inside a configuration file like this:
492-
493-
``` python
494-
[config]
495-
repository = FileRepository
496-
repositorypath = <path>
497-
```
498-
499-
Or, optionally an extra argument representing a subdirectory can be specified, e.g.:
500-
501-
``` shell
502-
export EASYBUILD_REPOSITORY=GitRepository
503-
export EASYBUILD_REPOSITORYPATH=<path>,<subdir>
504-
```
505-
506-
You do not have to worry about importing these classes,
507-
EasyBuild will make them available to the configuration file.
508-
509-
Using `git` requires the `GitPython` Python modules, using `svn`
510-
requires the `pysvn` Python module (see [Dependencies][dependencies]).
511-
512-
If access to the easyconfigs repository fails for some reason
513-
(e.g., no network or a missing required Python module), EasyBuild will
514-
issue a warning. The software package will still be installed, but the
515-
(successful) easyconfig will not be automatically added to the archive
516-
(i.e., it is not considered a fatal error).
517-
518-
519-
#### Logfile format (`--logfile-format`) {: #logfile_format }
520-
521-
*default*:
522-
`easybuild, easybuild-%(name)s-%(version)s-%(date)s.%(time)s.log`
523-
524-
The `logfile format` configuration setting contains a tuple
525-
specifying a log directory name and a template log file name.
526-
In both of these values, using the following string templates
527-
is supported:
528-
529-
* `%(name)s`: the name of the software package to install
530-
* `%(version)s`: the version of the software package to install
531-
* `%(date)s`: the date on which the installation was performed (in `YYYYMMDD` format, e.g. `20120324`)
532-
* `%(time)s`: the time at which the installation was started (in `HHMMSS` format, e.g. `214359`)
533-
534-
!!! note
535-
Because templating is supported in configuration files themselves (see
536-
[Templates and constants supported in configuration files][configuration_file_templates_constants]), the
537-
'`%`' character in these template values must be escaped when used in a configuration file (and only then),
538-
e.g., '`%%(name)s`'. Without escaping, an error like `InterpolationMissingOptionError: Bad value
539-
substitution` will be thrown by `ConfigParser`.
540-
541-
For example, configuring EasyBuild to generate a log file mentioning only the software name in a directory named
542-
`easybuild` can be done via the `--logfile-format` command line option:
543-
544-
``` shell
545-
eb --logfile-format="easybuild,easybuild-%(name)s.log" ...
546-
```
547-
548-
or the `$EASYBUILD_LOGFILE_FORMAT` environment variable:
549-
550-
``` shell
551-
export EASYBUILD_LOGFILE_FORMAT="easybuild,easybuild-%(name)s.log"
552-
```
553-
554-
or by including the following in an EasyBuild configuration file (note the use of '`%%`' to escape the `name`
555-
template value here):
556-
557-
``` ini
558-
logfile-format = easybuild,easybuild-%%(name)s.log
559-
```
560-
561443

562444
### Optional configuration settings {: #configuration_optional_settings }
563445

Diff for: docs/terminology.md

+4-9
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ which is split up into different `steps`:
2121
* unpacking sources
2222
* configuration
2323
* build
24+
* testing
2425
* installation
2526
* module generation
2627
* etc.
@@ -64,8 +65,8 @@ enabling code reuse across build procedure implementations.
6465
For each software package being built, the EasyBuild framework will determine which easyblock
6566
should be used, based on the name of the software package or the value of the `easyblock`
6667
specification parameter (see [Easyblock specification][writing_easyconfigs_easyblock_spec]).
67-
Since EasyBuild v2.0, an easyblock *must* be specified in case no matching easyblock is found based on the
68-
software name (cfr. [Automagic fallback to ConfigureMake][depr_ConfigureMake_fallback_eb1]).
68+
An easyblock *must* be specified in case no matching easyblock is found based on the
69+
software name.
6970

7071

7172
## Toolchains {: #toolchains }
@@ -90,7 +91,7 @@ Recent releases of EasyBuild include out-of-the-box toolchain support for:
9091

9192
* various compilers, including GCC, Intel, Clang, CUDA
9293
* common MPI libraries, such as Intel MPI, MPICH, MVAPICH2, OpenMPI
93-
* various numerical libraries, including ATLAS, Intel MKL, OpenBLAS, ScalaPACK, FFTW
94+
* various numerical libraries, including Intel MKL, OpenBLAS, ScalaPACK, FFTW
9495

9596
Please see the [Common toolchains][common_toolchains] page for details about the two most common toolchains,
9697
one for "free and open source software" (`foss`) based on GCC and one based on the Intel compilers
@@ -107,12 +108,6 @@ When the `system` toolchain is used, a corresponding `system` module file is not
107108
environment is being defined.
108109

109110

110-
111-
### `dummy` toolchain *(DEPRECATED)* {: #dummy_toolchain }
112-
113-
The `dummy` toolchain has been deprecated in EasyBuild v4.0, and replaced by the [`system` toolchain][system_toolchain].
114-
115-
116111
### Common toolchains
117112

118113
For more information on the concept of *common toolchains*, see [Common toolchains][common_toolchains].

Diff for: docs/using-easybuild.md

+4-10
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ These locations are only considered for easyconfig files that are specified only
3030
*not* for easyconfig files that are specified via an absolute path. The dependencies are resolved using the
3131
robot search path (see [robot search path][robot_search_path]).
3232

33-
!!! note
34-
35-
For easyconfig files specified on the `eb` command line, the *full* robot search path is only considered since
36-
EasyBuild v2.0.0. Earlier versions only considered the local working directory and the easyconfig files that are
37-
part of the active EasyBuild installation for *explicitly specified* easyconfig files.
38-
3933

4034
### By providing a single easyconfig file {: #specifying_easyconfigs_single }
4135

@@ -437,7 +431,7 @@ CFGS1=/home/example/easybuild-easyconfigs/easybuild/easyconfigs/m/Mesquite
437431
* $CFGS1/Mesquite-2.3.0-GCCcore-8.3.0.eb
438432
```
439433

440-
For more specific searching, a regular expression pattern can be supplied (since EasyBuild v2.1.1).
434+
For more specific searching, a regular expression pattern can be supplied.
441435

442436
For example, to search which easyconfig files are available for GCC v11.x, without listing easyconfig files that use
443437
GCC v11.x as a toolchain:
@@ -676,7 +670,7 @@ Matching setup:
676670
You can do a "dry-run" overview by supplying `-D/--dry-run`:
677671

678672
```console
679-
$ eb binutils-2.39.eb -D
673+
$ eb binutils-2.39.eb -Dr
680674
== Temporary log file in case of crash /tmp/eb-3lh496ml/easybuild-hxmie76g.log
681675
Dry run: printing build status of easyconfigs and dependencies
682676
CFGS=/Volumes/work/easybuild-easyconfigs/easybuild/easyconfigs
@@ -697,15 +691,15 @@ Note how the different status symbols denote distinct handling states by EasyBui
697691

698692
!!! note
699693

700-
Since EasyBuild v2.4.0, a detailed overview of the build and install procedure that EasyBuild
694+
A detailed overview of the build and install procedure that EasyBuild
701695
will be execute can be obtained using `--extended-dry-run` or `-x`, see [Extended dry run][extended_dry_run].
702696

703697

704698
## Getting an overview of missing installations {: #eb_missing }
705699

706700
*(`--missing-modules` / `-M`)*
707701

708-
Since EasyBuild v3.9.1, you can obtain a list of missing installations (i.e. easyconfigs for which
702+
You can obtain a list of missing installations (i.e. easyconfigs for which
709703
no corresponding environment module file is available yet) using `eb --missing-modules` (or `-eb -M` for short):
710704

711705
```console

0 commit comments

Comments
 (0)