From 88c8d1a3c6050aa7f2194aa1061563babb5b749a Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 30 Jun 2021 20:39:17 -0400 Subject: [PATCH] rename "minimal" preset to "basic" --- cmake/presets/{minimal.cmake => basic.cmake} | 0 doc/src/Build_cmake.rst | 2 +- doc/src/Build_extras.rst | 4 +-- doc/src/Build_package.rst | 10 +++---- doc/src/Howto_cmake.rst | 6 ++--- doc/src/Howto_wsl.rst | 2 +- doc/src/Python_install.rst | 2 +- lib/qmmm/README | 2 +- python/examples/pylammps/README.md | 2 +- src/Makefile | 28 ++++++++++---------- 10 files changed, 29 insertions(+), 29 deletions(-) rename cmake/presets/{minimal.cmake => basic.cmake} (100%) diff --git a/cmake/presets/minimal.cmake b/cmake/presets/basic.cmake similarity index 100% rename from cmake/presets/minimal.cmake rename to cmake/presets/basic.cmake diff --git a/doc/src/Build_cmake.rst b/doc/src/Build_cmake.rst index 73268af0ce..2a64bc3240 100644 --- a/doc/src/Build_cmake.rst +++ b/doc/src/Build_cmake.rst @@ -140,7 +140,7 @@ can be used several times in one command. For your convenience we provide :ref:`CMake presets ` that combine multiple settings to enable optional LAMMPS packages or use a different compiler tool chain. Those are loaded with the *-C* flag -(``-C ../cmake/presets/minimal.cmake``). This step would only be needed +(``-C ../cmake/presets/basic.cmake``). This step would only be needed once, as the settings from the preset files are stored in the ``CMakeCache.txt`` file. It is also possible to customize the build by adding one or more *-D* flags to the CMake command line. diff --git a/doc/src/Build_extras.rst b/doc/src/Build_extras.rst index 68ebae15a7..a78b798636 100644 --- a/doc/src/Build_extras.rst +++ b/doc/src/Build_extras.rst @@ -622,7 +622,7 @@ This list was last updated for version 3.4.1 of the Kokkos library. mkdir build-kokkos-cuda cd build-kokkos-cuda - cmake -C ../cmake/presets/minimal.cmake -C ../cmake/presets/kokkos-cuda.cmake ../cmake + cmake -C ../cmake/presets/basic.cmake -C ../cmake/presets/kokkos-cuda.cmake ../cmake cmake --build . .. tab:: Basic traditional make settings: @@ -1805,7 +1805,7 @@ verified to work in February 2020 with Quantum Espresso versions 6.3 to .. code-block:: bash - cmake -C ../cmake/presets/minimal.cmake -D PKG_QMMM=yes \ + cmake -C ../cmake/presets/basic.cmake -D PKG_QMMM=yes \ -D BUILD_LIB=yes -DBUILD_SHARED_LIBS=yes ../cmake After completing the LAMMPS build and also configuring and diff --git a/doc/src/Build_package.rst b/doc/src/Build_package.rst index 409b5b3aee..a7dda52b41 100644 --- a/doc/src/Build_package.rst +++ b/doc/src/Build_package.rst @@ -167,7 +167,7 @@ one of them as a starting point and customize it to your needs. .. code-block:: bash - cmake -C ../cmake/presets/minimal.cmake [OPTIONS] ../cmake # enable just a few core packages + cmake -C ../cmake/presets/basic.cmake [OPTIONS] ../cmake # enable just a few core packages cmake -C ../cmake/presets/most.cmake [OPTIONS] ../cmake # enable most packages cmake -C ../cmake/presets/download.cmake [OPTIONS] ../cmake # enable packages which download sources or potential files cmake -C ../cmake/presets/nolib.cmake [OPTIONS] ../cmake # disable packages that do require extra libraries or tools @@ -222,10 +222,10 @@ These commands install/un-install sets of packages: make yes-all # install all packages make no-all # uninstall all packages - make yes-minimal # install all few commonly used pgks in src - make no-minimal # remove all commonly used pkgs from src dir - make yes-most # install all many pgks w/o libs in src - make no-most # remove all many pkgs w/o libs from src dir + make yes-basic # install a few commonly used packages' + make no-basic # remove a few commonly used packages' + make yes-most # install most packages w/o libs' + make no-most # remove most packages w/o libs' make yes-lib # install packages that require extra libraries make no-lib # uninstall packages that require extra libraries make yes-ext # install packages that require external libraries diff --git a/doc/src/Howto_cmake.rst b/doc/src/Howto_cmake.rst index 655c90bfd9..244bcf6323 100644 --- a/doc/src/Howto_cmake.rst +++ b/doc/src/Howto_cmake.rst @@ -382,9 +382,9 @@ change some variables later with additional *-D* flags. A few examples: .. code-block:: bash - cmake -C ../cmake/presets/minimal.cmake -D PKG_MISC=on ../cmake + cmake -C ../cmake/presets/basic.cmake -D PKG_MISC=on ../cmake cmake -C ../cmake/presets/clang.cmake -C ../cmake/presets/most.cmake ../cmake - cmake -C ../cmake/presets/minimal.cmake -D BUILD_MPI=off ../cmake + cmake -C ../cmake/presets/basic.cmake -D BUILD_MPI=off ../cmake The first command will install the packages ``KSPACE``, ``MANYBODY``, ``MOLECULE``, ``RIGID`` and ``MISC``; the first four from the preset @@ -400,7 +400,7 @@ It is also possible to do this incrementally. .. code-block:: bash - cmake -C ../cmake/presets/minimal.cmake ../cmake + cmake -C ../cmake/presets/basic.cmake ../cmake cmake -D PKG_MISC=on . will achieve the same final configuration as in the first example above. diff --git a/doc/src/Howto_wsl.rst b/doc/src/Howto_wsl.rst index 28251ba5ee..df5644451f 100644 --- a/doc/src/Howto_wsl.rst +++ b/doc/src/Howto_wsl.rst @@ -208,7 +208,7 @@ Presets are a way to specify a collection of CMake options using a file. .. code-block:: bash - cmake ../cmake/presets/minimal.cmake ../cmake + cmake ../cmake/presets/basic.cmake ../cmake This command configures the build and generates the necessary Makefiles. To compile the binary, run the make command. diff --git a/doc/src/Python_install.rst b/doc/src/Python_install.rst index 6b224bbf40..abf96accbf 100644 --- a/doc/src/Python_install.rst +++ b/doc/src/Python_install.rst @@ -69,7 +69,7 @@ this. cd build # configure LAMMPS compilation - cmake -C ../cmake/presets/minimal.cmake -D BUILD_SHARED_LIBS=on \ + cmake -C ../cmake/presets/basic.cmake -D BUILD_SHARED_LIBS=on \ -D LAMMPS_EXCEPTIONS=on -D PKG_PYTHON=on ../cmake # compile LAMMPS diff --git a/lib/qmmm/README b/lib/qmmm/README index ac8215ac05..7e9f30d692 100644 --- a/lib/qmmm/README +++ b/lib/qmmm/README @@ -55,7 +55,7 @@ build configuration with CMake: mkdir build-qmmm cd build-qmmm - cmake -C ../cmake/presets/minimal.cmake -D PKG_QMMM=yes \ + cmake -C ../cmake/presets/basic.cmake -D PKG_QMMM=yes \ -D BUILD_LIB=yes -DBUILD_SHARED_LIBS=yes ../cmake make make install diff --git a/python/examples/pylammps/README.md b/python/examples/pylammps/README.md index 7ee8c8ac90..e66f5a2a8e 100644 --- a/python/examples/pylammps/README.md +++ b/python/examples/pylammps/README.md @@ -51,7 +51,7 @@ which has both LAMMPS and its Python package installed: 6. Configure LAMMPS compilation (CMake) ```shell - (myenv)$ cmake -C ../cmake/presets/minimal.cmake \ + (myenv)$ cmake -C ../cmake/presets/basic.cmake \ -D BUILD_SHARED_LIBS=on \ -D LAMMPS_EXCEPTIONS=on -D PKG_PYTHON=on \ -D CMAKE_INSTALL_PREFIX=$VIRTUAL_ENV \ diff --git a/src/Makefile b/src/Makefile index b229bac973..9beba726cc 100644 --- a/src/Makefile +++ b/src/Makefile @@ -38,7 +38,7 @@ endif # Package variables # PACKAGE = all packages -# PACKMIN = a few core packages +# PACKBASIC = a few core packages # PACKMOST = most packages that do not require additional libs # PACKLIB = all packages that require an additional lib # should be PACKSYS + PACKINT + PACKEXT @@ -134,7 +134,7 @@ PACKAGE = \ # NOTE: the last four packages must remain at the end since # they depend on other packages to be installed first. -PACKMIN = kspace manybody molecule rigid +PACKBASIC = kspace manybody molecule rigid PACKMOST = \ asphere \ @@ -270,10 +270,10 @@ help: @echo 'make no-package remove a single pkg from src dir' @echo 'make yes-all install all pgks in src dir' @echo 'make no-all remove all pkgs from src dir' - @echo 'make yes-standard (yes-std) install all standard pkgs' - @echo 'make no-standard (no-std) remove all standard pkgs' - @echo 'make yes-user install all user pkgs' - @echo 'make no-user remove all user pkgs' + @echo 'make yes-basic install a few commonly used pgks' + @echo 'make no-basic remove a few commonly used pkgs' + @echo 'make yes-most install most pgks w/o libs' + @echo 'make no-most remove most pgks w/o libs' @echo 'make yes-lib install all pkgs with libs (included or ext)' @echo 'make no-lib remove all pkgs with libs (included or ext)' @echo 'make yes-ext install all pkgs with external libs' @@ -478,10 +478,10 @@ package: @echo 'make package-installed (pi) list of installed packages' @echo 'make yes-package install a single pgk in src dir' @echo 'make no-package remove a single pkg from src dir' - @echo 'make yes-minimal install all few commonly used pgks in src' - @echo 'make no-minimal remove all commonly used pkgs from src dir' - @echo 'make yes-most install all many pgks w/o libs in src' - @echo 'make no-most remove all many pkgs w/o libs from src dir' + @echo 'make yes-basic install a few commonly used pgks in src' + @echo 'make no-basic remove a few commonly used pkgs from src dir' + @echo 'make yes-most install most pgks w/o libs in src' + @echo 'make no-most remove most pkgs w/o libs from src dir' @echo 'make yes-all install all pgks in src dir' @echo 'make no-all remove all pkgs from src dir' @echo 'make yes-lib install all pkgs with libs (included or ext)' @@ -513,11 +513,11 @@ yes-user: no-user: @echo 'There are no more "standard" or "user" packages in LAMMPS' -yes-minimal: - @for p in $(PACKMIN); do $(MAKE) yes-$$p; done +yes-basic: + @for p in $(PACKBASIC); do $(MAKE) yes-$$p; done -no-minimal: - @for p in $(PACKMIN); do $(MAKE) no-$$p; done +no-basic: + @for p in $(PACKBASIC); do $(MAKE) no-$$p; done yes-most: @for p in $(PACKMOST); do $(MAKE) yes-$$p; done