From 73ee7805dc9dae77d2adf005925cf63ca4a69a7e Mon Sep 17 00:00:00 2001 From: Yury Lysogorskiy Date: Thu, 8 Apr 2021 12:13:33 +0200 Subject: [PATCH] remove GPL3 license terms from src/USER-PACE/pair_pace.* delete lib/pace/CMakeLists.txt --- lib/pace/CMakeLists.txt | 19 ------------------- lib/pace/TODO | 30 ------------------------------ src/USER-PACE/pair_pace.cpp | 16 +--------------- src/USER-PACE/pair_pace.h | 16 +--------------- 4 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 lib/pace/CMakeLists.txt delete mode 100644 lib/pace/TODO diff --git a/lib/pace/CMakeLists.txt b/lib/pace/CMakeLists.txt deleted file mode 100644 index 2884c83cb9..0000000000 --- a/lib/pace/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 3.7) # CMake version check -project(aceevaluator) -set(CMAKE_CXX_STANDARD 11) # Enable c++11 standard - - -set(PACE_EVALUATOR_PATH ${CMAKE_CURRENT_LIST_DIR}/src/USER-PACE) -# message("CMakeLists.txt DEBUG: PACE_EVALUATOR_PATH=${PACE_EVALUATOR_PATH}") -set(PACE_EVALUATOR_SRC_PATH ${PACE_EVALUATOR_PATH}) - -FILE(GLOB PACE_EVALUATOR_SOURCE_FILES ${PACE_EVALUATOR_SRC_PATH}/*.cpp) -list(FILTER PACE_EVALUATOR_SOURCE_FILES EXCLUDE REGEX ".*pair_pace.*") -set(PACE_EVALUATOR_INCLUDE_DIR ${PACE_EVALUATOR_SRC_PATH}) - - -##### aceevaluator ##### -add_library(aceevaluator ${PACE_EVALUATOR_SOURCE_FILES}) -target_include_directories(aceevaluator PUBLIC ${PACE_EVALUATOR_INCLUDE_DIR}) -target_compile_options(aceevaluator PRIVATE -O3) -set_target_properties(aceevaluator PROPERTIES OUTPUT_NAME pace${LAMMPS_MACHINE}) diff --git a/lib/pace/TODO b/lib/pace/TODO deleted file mode 100644 index 8021916923..0000000000 --- a/lib/pace/TODO +++ /dev/null @@ -1,30 +0,0 @@ -[TODO/DONE] pair_pace.cpp and pair_pace.h will have to go into src/USER-PACE and thus also need to conform to our requirements. - -[TODO] also src/USER-PACE would need to have an Install.sh file that integrates the settings from the lib folder into the conventional build process. -[TODO] there would have to be a lib/pace folder for building/interfacing to the library. - -[TODO] how you organize your repo is up to you. a better way to describe what you would have to do is to point you to examples. -which of the examples is relevant depends on what build system you are using for your "PACE" external package. - -If you are using CMake to build it, you can look at the KIM package -If you are using autoconf/automake, you can look at the USER-PLUMED package -If you are using neither (just a plain Makefile), you can look at the VORONOI or QUIP package -The following additional modifications are needed: - -[TODO] lib/pace: needs one or more Makefile.lammps, a README and an Install.py file -[TODO] src/Makefile: needs support for the USER-PACE package and compiling via lib-pace. Also the package needs to be added to the PACKEXT and PACKLIB variables - -[DONE] cmake/Modules/Packages/USER-PACE.cmake needs to be added -[DONE] cmake/CMakeLists.txt needs to include it in case the package is enabled. - -[TODO] doc/src/Build_extra.rst needs to include the build instructions for CMake and traditional make -[TODO] doc/src/Package_user.rst and doc/src/Package_details.rst needs to contain relevant information and links - - -Because of the different build systems, there are different steps required, but each of the examples I've pointed out are tested and used regularly and thus should be working sufficiently well. -Mind you the QUIP package is set up in such a way, that no automatic download is possible and a manual download and compilation is required. So that is the least preferred and least convenient option. - -We are happy to provide more details, but that requires that you first have something that already is following either of the suggested variants, so that we don't have to discuss in all generality. - -I would also suggest to close this pull request here, leave all files in place, but then start a new branch from the current master and then move the few things over you need to retain, -add the build environment files and then start working on getting it to do what it should. \ No newline at end of file diff --git a/src/USER-PACE/pair_pace.cpp b/src/USER-PACE/pair_pace.cpp index 41551e454c..c12753603a 100644 --- a/src/USER-PACE/pair_pace.cpp +++ b/src/USER-PACE/pair_pace.cpp @@ -7,21 +7,7 @@ Copyright 2021 Yury Lysogorskiy^1, Cas van der Oord^2, Anton Bochkarev^1, ^2: University of Cambridge, Cambridge, United Kingdom ^3: Sandia National Laboratories, Albuquerque, New Mexico, USA ^4: University of British Columbia, Vancouver, BC, Canada - - - This FILENAME is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - */ +*/ // diff --git a/src/USER-PACE/pair_pace.h b/src/USER-PACE/pair_pace.h index b29ee3a7a9..37509cff5e 100644 --- a/src/USER-PACE/pair_pace.h +++ b/src/USER-PACE/pair_pace.h @@ -7,21 +7,7 @@ Copyright 2021 Yury Lysogorskiy^1, Cas van der Oord^2, Anton Bochkarev^1, ^2: University of Cambridge, Cambridge, United Kingdom ^3: Sandia National Laboratories, Albuquerque, New Mexico, USA ^4: University of British Columbia, Vancouver, BC, Canada - - - This FILENAME is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - */ +*/ //