diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15f352c..6ed87f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,9 @@ name: build on: push: - branches: [ unstable ] + branches: [ notriqs ] pull_request: - branches: [ unstable ] + branches: [ notriqs ] workflow_call: workflow_dispatch: @@ -56,7 +56,6 @@ jobs: gfortran hdf5-tools libblas-dev - libboost-dev libclang-15-dev libc++-15-dev libc++abi-15-dev @@ -73,7 +72,6 @@ jobs: python3-clang-15 python3-dev python3-mako - python3-matplotlib python3-mpi4py python3-numpy python3-pip @@ -84,7 +82,7 @@ jobs: - name: Install homebrew dependencies if: matrix.os == 'macos-12' run: | - brew install ccache gcc@12 llvm boost fftw hdf5 open-mpi openblas + brew install ccache gcc@12 llvm hdf5 open-mpi openblas mkdir $HOME/.venv python3 -m venv $HOME/.venv/my_python source $HOME/.venv/my_python/bin/activate @@ -99,25 +97,13 @@ jobs: echo "PATH=/usr/local/opt/llvm/bin:$PATH" >> $GITHUB_ENV echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV - - name: Build & Install TRIQS - env: - CC: ${{ matrix.cc }} - CXX: ${{ matrix.cxx }} - run: | - git clone https://github.com/TRIQS/triqs --branch unstable - mkdir triqs/build && cd triqs/build - cmake .. -DBuild_Tests=OFF -DCMAKE_INSTALL_PREFIX=$HOME/install - make -j1 install VERBOSE=1 - cd ../ - - name: Build app4triqs env: CC: ${{ matrix.cc }} CXX: ${{ matrix.cxx }} LIBRARY_PATH: /usr/local/opt/llvm/lib run: | - source $HOME/install/share/triqs/triqsvars.sh - mkdir build && cd build && cmake .. + mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/install make -j2 || make -j1 VERBOSE=1 - name: Test app4triqs @@ -125,7 +111,6 @@ jobs: DYLD_FALLBACK_LIBRARY_PATH: /usr/local/opt/llvm/lib OPENBLAS_NUM_THREADS: "1" run: | - source $HOME/install/share/triqs/triqsvars.sh cd build ctest -j2 --output-on-failure diff --git a/CMakeLists.txt b/CMakeLists.txt index 1909be8..a5ed6a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,28 +27,22 @@ endif() # ############ # Define Project -project(app4triqs VERSION 3.2.0 LANGUAGES C CXX) +project(app4triqs VERSION 1.2.0 LANGUAGES C CXX) get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY) -# ############ -# Load TRIQS and CPP2PY -find_package(TRIQS 3.2 REQUIRED) - -# Get the git hash & print status -triqs_get_git_hash_of_source_dir(PROJECT_GIT_HASH) +message(STATUS "-------- app4triqs version and git hash detection -------------") +find_package(Git) +execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + OUTPUT_VARIABLE PROJECT_GIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE +) message(STATUS "${PROJECT_NAME} version : ${PROJECT_VERSION}") message(STATUS "${PROJECT_NAME} Git hash: ${PROJECT_GIT_HASH}") -# Enforce Consistent Versioning -if(NOT ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} VERSION_EQUAL ${TRIQS_VERSION_MAJOR}.${TRIQS_VERSION_MINOR}) - message(FATAL_ERROR "The ${PROJECT_NAME} version ${PROJECT_VERSION} is not compatible with TRIQS version ${TRIQS_VERSION}.") -endif() - -# Default Install directory to TRIQS_ROOT if not given or when provided as relative path. +# Assert that install directory is provided and is absolute path. if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR (NOT IS_ABSOLUTE ${CMAKE_INSTALL_PREFIX})) - message(STATUS "No install prefix given (or invalid). Defaulting to TRIQS_ROOT") - set(CMAKE_INSTALL_PREFIX ${TRIQS_ROOT} CACHE PATH "default install path" FORCE) - set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE) + message(FATAL_ERROR "No install prefix given (or invalid)") endif() if(NOT IS_SUBPROJECT) message(STATUS "-------- CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX} --------") @@ -71,9 +65,6 @@ endif() # Python Support option(PythonSupport "Build with Python support" ON) -if(PythonSupport AND NOT TRIQS_WITH_PYTHON_SUPPORT) - message(FATAL_ERROR "TRIQS was installed without Python support. Cannot build the Python Interface. Disable the build with -DPythonSupport=OFF") -endif() # Documentation option(Build_Documentation "Build documentation" OFF) @@ -124,6 +115,25 @@ target_compile_options(${PROJECT_NAME}_warnings $<$:-Wno-tautological-constant-compare> ) +# --------------------------------- +# Resolve Clang Linktime Problems +# CMake will adjust any linker flags from '-L path_to/mylib.so' to -lmylib +# if the proper mylib.so is automatically found by the linker, i.e. +# the directory comes first in LIBRARY_PATH. +# The clang linker however ignores LIBRARY_PATH. +# We thus explicitly add the content of LIBRARY_PATH to the LDFLAGS +# FIXME For future cmake versions we should populate the +# INTERFACE_LINK_DIRECTORIES of the triqs target +# --------------------------------- +if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND DEFINED ENV{LIBRARY_PATH}) + string(REPLACE ":" ";" LINK_DIRS $ENV{LIBRARY_PATH}) + foreach(dir ${LINK_DIRS}) + string(APPEND CMAKE_SHARED_LINKER_FLAGS " -L${dir}") + string(APPEND CMAKE_MODULE_LINKER_FLAGS " -L${dir}") + string(APPEND CMAKE_EXE_LINKER_FLAGS " -L${dir}") + endforeach() +endif() + # Provide GNU Installation directories include(GNUInstallDirs) @@ -170,7 +180,6 @@ if(BUILD_DEBIAN_PACKAGE AND NOT IS_SUBPROJECT) set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) set(CPACK_PACKAGE_CONTACT "https://github.com/TRIQS/${PROJECT_NAME}") execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CMAKE_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) - set(CPACK_DEBIAN_PACKAGE_DEPENDS "triqs (>= 3.2)") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) include(CPack) diff --git a/COPYING.txt b/COPYING.txt deleted file mode 100644 index 94a9ed0..0000000 --- a/COPYING.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program 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 . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 5502cd9..0000000 --- a/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# See ../triqs/packaging for other options -FROM flatironinstitute/triqs:unstable-ubuntu-clang -ARG APPNAME=app4triqs - -COPY requirements.txt /src/$APPNAME/requirements.txt -RUN pip3 install -r /src/$APPNAME/requirements.txt - -COPY --chown=build . $SRC/$APPNAME -WORKDIR $BUILD/$APPNAME -RUN chown build . -USER build -ARG BUILD_ID -ARG CMAKE_ARGS -RUN cmake $SRC/$APPNAME -DTRIQS_ROOT=${INSTALL} $CMAKE_ARGS && make -j4 || make -j1 VERBOSE=1 -USER root -RUN make install diff --git a/Dockerfile.build b/Dockerfile.build new file mode 100644 index 0000000..24eba7d --- /dev/null +++ b/Dockerfile.build @@ -0,0 +1,26 @@ +# See packaging for various base options +FROM flatironinstitute/triqs:base +ARG APPNAME=app4triqs + +COPY requirements.txt /src/$APPNAME/requirements.txt +RUN pip3 install -r /src/$APPNAME/requirements.txt + +ARG BUILDUID=983 +RUN useradd -u $BUILDUID -m build + +ENV SRC=/src \ + BUILD=/home/build \ + INSTALL=/usr/local \ + PYTHONPATH=/usr/local/lib/python$PYTHON_VERSION/site-packages \ + CMAKE_PREFIX_PATH=/usr/lib/cmake/$APPNAME + +COPY --chown=build . $SRC/$APPNAME +WORKDIR $BUILD/$APPNAME +RUN chown build . +USER build +ARG BUILD_ID +ARG CMAKE_ARGS +ARG NCORES=4 +RUN cmake $SRC/$APPNAME -DCMAKE_INSTALL_PREFIX=$INSTALL -DCLANG_OPT="$CXXFLAGS" $CMAKE_ARGS && make -j$NCORES || make -j1 VERBOSE=1 +USER root +RUN make install diff --git a/Jenkinsfile b/Jenkinsfile index ff81d63..73f5441 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,19 +3,16 @@ def projectName = "app4triqs" /* set to app/repo name */ def dockerName = projectName.toLowerCase(); /* which platform to build documentation on */ def documentationPlatform = "ubuntu-clang" -/* depend on triqs upstream branch/project */ -def triqsBranch = env.CHANGE_TARGET ?: env.BRANCH_NAME -def triqsProject = '/TRIQS/triqs/' + triqsBranch.replaceAll('/', '%2F') /* whether to keep and publish the results */ -def keepInstall = !env.BRANCH_NAME.startsWith("PR-") +def publish = !env.BRANCH_NAME.startsWith("PR-") properties([ disableConcurrentBuilds(), buildDiscarder(logRotator(numToKeepStr: '10', daysToKeepStr: '30')), - pipelineTriggers(keepInstall ? [ + pipelineTriggers(publish ? [ upstream( threshold: 'SUCCESS', - upstreamProjects: triqsProject + upstreamProjects: '/TRIQS/cpp2py/master,/TRIQS/h5/unstable' ) ] : []) ]) @@ -24,7 +21,7 @@ properties([ def platforms = [:] /****************** linux builds (in docker) */ -/* Each platform must have a corresponding Dockerfile.PLATFORM in triqs/packaging */ +/* Each platform must have a corresponding Dockerfile.PLATFORM in packaging */ def dockerPlatforms = ["ubuntu-clang", "ubuntu-gcc", "ubuntu-intel", "sanitize"] /* .each is currently broken in jenkins */ for (int i = 0; i < dockerPlatforms.size(); i++) { @@ -34,22 +31,22 @@ for (int i = 0; i < dockerPlatforms.size(); i++) { checkout scm /* construct a Dockerfile for this base */ sh """ - ( echo "FROM flatironinstitute/triqs:${triqsBranch}-${env.STAGE_NAME}" ; sed '0,/^FROM /d' Dockerfile ) > Dockerfile.jenkins - mv -f Dockerfile.jenkins Dockerfile + ( cat packaging/Dockerfile.${env.STAGE_NAME} ; sed '0,/^FROM /d' Dockerfile.build ) > Dockerfile """ /* build and tag */ def args = '' if (platform == documentationPlatform) - args = '-DBuild_Documentation=1' + args = '-DBuild_Documentation=1 -DMATHJAX_PATH=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2' else if (platform == "sanitize") args = '-DASAN=ON -DUBSAN=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo' - def img = docker.build("flatironinstitute/${dockerName}:${env.BRANCH_NAME}-${env.STAGE_NAME}", "--build-arg APPNAME=${projectName} --build-arg BUILD_ID=${env.BUILD_TAG} --build-arg CMAKE_ARGS='${args}' .") + def uid = sh(returnStdout: true, script: "id -u").trim() + def img = docker.build("flatironinstitute/${dockerName}:${env.BRANCH_NAME}-${env.STAGE_NAME}", "--build-arg APPNAME=${projectName} --build-arg BUILD_ID=${env.BUILD_TAG} --build-arg CMAKE_ARGS='${args}' --build-arg BUILDUID=${uid} .") catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') { img.inside("--shm-size=4gb") { sh "make -C \$BUILD/${projectName} test CTEST_OUTPUT_ON_FAILURE=1" } } - if (!keepInstall) { + if (!publish || platform != documentationPlatform) { sh "docker rmi --no-prune ${img.imageName()}" } } } } @@ -70,9 +67,8 @@ for (int i = 0; i < osxPlatforms.size(); i++) { def tmpDir = pwd(tmp:true) def buildDir = "$tmpDir/build" /* install real branches in a fixed predictable place so apps can find them */ - def installDir = keepInstall ? "${env.HOME}/install/${projectName}/${env.BRANCH_NAME}/${platform}" : "$tmpDir/install" - def triqsDir = "${env.HOME}/install/triqs/${triqsBranch}/${platform}" - def venv = triqsDir + def installDir = "$tmpDir/install" + def venv = installDir dir(installDir) { deleteDir() } @@ -92,9 +88,9 @@ for (int i = 0; i < osxPlatforms.size(); i++) { "VIRTUAL_ENV=$venv", "OMP_NUM_THREADS=2"]) { deleteDir() - /* note: this is installing into the parent (triqs) venv (install dir), which is thus shared among apps and so not be completely safe */ + sh "python3 -m venv $venv" sh "pip3 install -U -r $srcDir/requirements.txt" - sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir -DTRIQS_ROOT=$triqsDir" + sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir" sh "make -j2 || make -j1 VERBOSE=1" catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') { try { sh "make test CTEST_OUTPUT_ON_FAILURE=1" @@ -112,7 +108,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) { def error = null try { parallel platforms - if (keepInstall) { node('linux && docker && triqs') { + if (publish) { node('linux && docker && triqs') { /* Publish results */ stage("publish") { timeout(time: 5, unit: 'MINUTES') { def commit = sh(returnStdout: true, script: "git rev-parse HEAD").trim() diff --git a/LICENSE.txt b/LICENSE.txt index 4b35411..d645695 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,18 +1,202 @@ -app4triqs - An example application using triqs and cpp2py - -Copyright (C) 2017-2018, N. Wentzell, O. Parcollet -Copyright (C) 2018-2019, The Simons Foundation - authors: N. Wentzell, D. Simons, H. Strand, O. Parcollet - -app4triqs 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. - -app4triqs 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 -app4triqs (in the file COPYING.txt in this directory). If not, see -. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md index 1657290..a277b13 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![build](https://github.com/TRIQS/app4triqs/workflows/build/badge.svg)](https://github.com/TRIQS/app4triqs/actions?query=workflow%3Abuild) +[![build](https://github.com/TRIQS/app4triqs/workflows/build/badge.svg?branch=notriqs)](https://github.com/TRIQS/app4triqs/actions?query=workflow%3Abuild) # app4triqs - A skeleton for a TRIQS application diff --git a/c++/app4triqs/CMakeLists.txt b/c++/app4triqs/CMakeLists.txt index 5f51a38..9b78554 100644 --- a/c++/app4triqs/CMakeLists.txt +++ b/c++/app4triqs/CMakeLists.txt @@ -2,10 +2,11 @@ file(GLOB_RECURSE sources *.cpp) add_library(${PROJECT_NAME}_c ${sources}) add_library(${PROJECT_NAME}::${PROJECT_NAME}_c ALIAS ${PROJECT_NAME}_c) -# Link against triqs and enable warnings -target_link_libraries(${PROJECT_NAME}_c PUBLIC triqs PRIVATE $) +# Enable warnings +target_link_libraries(${PROJECT_NAME}_c PRIVATE $) # Configure target and compilation +target_compile_features(${PROJECT_NAME}_c PUBLIC cxx_std_23) set_target_properties(${PROJECT_NAME}_c PROPERTIES POSITION_INDEPENDENT_CODE ON VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} @@ -14,16 +15,17 @@ target_include_directories(${PROJECT_NAME}_c PUBLIC $) target_compile_definitions(${PROJECT_NAME}_c PUBLIC APP4TRIQS_GIT_HASH=${PROJECT_GIT_HASH} - TRIQS_GIT_HASH=${TRIQS_GIT_HASH} $<$:APP4TRIQS_DEBUG> - $<$:TRIQS_DEBUG> - $<$:TRIQS_ARRAYS_ENFORCE_BOUNDCHECK> ) # Install library and headers install(TARGETS ${PROJECT_NAME}_c EXPORT ${PROJECT_NAME}-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h") +# ========= Additional Depdencies ========== + +# Link against HDF5 C++ Interface +target_link_libraries(${PROJECT_NAME}_c PUBLIC h5::h5_c) # ========= Static Analyzer Checks ========== diff --git a/c++/app4triqs/app4triqs.hpp b/c++/app4triqs/app4triqs.hpp index b92d513..ebd4871 100644 --- a/c++/app4triqs/app4triqs.hpp +++ b/c++/app4triqs/app4triqs.hpp @@ -1,6 +1,4 @@ #pragma once -#include -#include #include
namespace app4triqs { diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index e26dfba..40a4c4e 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -65,3 +65,10 @@ external_dependency(GTest BUILD_ALWAYS EXCLUDE_FROM_ALL ) + +# -- h5 -- +external_dependency(h5 + GIT_REPO https://github.com/TRIQS/h5 + GIT_TAG unstable + BUILD_ALWAYS +) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 40eb49c..bc73e29 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -37,7 +37,6 @@ foreach(example ${ExampleList}) get_filename_component(d ${example} DIRECTORY) add_executable(${PROJECT_NAME}_doc_${f} EXCLUDE_FROM_ALL ${example}) set_property(TARGET ${PROJECT_NAME}_doc_${f} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${d}) - target_link_libraries(${PROJECT_NAME}_doc_${f} triqs) add_custom_command(TARGET ${PROJECT_NAME}_doc_${f} COMMAND ${PROJECT_NAME}_doc_${f} > ${CMAKE_CURRENT_SOURCE_DIR}/${d}/${f}.output 2>/dev/null WORKING_DIRECTORY ${d} @@ -56,7 +55,7 @@ endif() add_custom_target(${PROJECT_NAME}_docs_sphinx ALL) add_custom_command( TARGET ${PROJECT_NAME}_docs_sphinx - COMMAND PYTHONPATH=${PROJECT_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SPHINXBUILD_EXECUTABLE} -j auto -c . -b html ${CMAKE_CURRENT_SOURCE_DIR} html + COMMAND PYTHONPATH=${PROJECT_BINARY_DIR}/python:${h5_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SPHINXBUILD_EXECUTABLE} -c . -j auto -b html ${CMAKE_CURRENT_SOURCE_DIR} html ) option(Sphinx_Only "When building the documentation, skip the Python Modules and the generation of C++ Api and example outputs" OFF) diff --git a/doc/_static/triqs_logo/Icon/JPG/Triqs_Icon_RGB_Black.jpg b/doc/_static/triqs_logo/Icon/JPG/Triqs_Icon_RGB_Black.jpg deleted file mode 100755 index a25819a..0000000 Binary files a/doc/_static/triqs_logo/Icon/JPG/Triqs_Icon_RGB_Black.jpg and /dev/null differ diff --git a/doc/_static/triqs_logo/Icon/JPG/Triqs_Icon_RGB_Full.jpg b/doc/_static/triqs_logo/Icon/JPG/Triqs_Icon_RGB_Full.jpg deleted file mode 100755 index 8fac42a..0000000 Binary files a/doc/_static/triqs_logo/Icon/JPG/Triqs_Icon_RGB_Full.jpg and /dev/null differ diff --git a/doc/_static/triqs_logo/Icon/SVG/Triqs_Icon_RGB_Black.svg b/doc/_static/triqs_logo/Icon/SVG/Triqs_Icon_RGB_Black.svg deleted file mode 100755 index ff59848..0000000 --- a/doc/_static/triqs_logo/Icon/SVG/Triqs_Icon_RGB_Black.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/doc/_static/triqs_logo/Icon/SVG/Triqs_Icon_RGB_Full.svg b/doc/_static/triqs_logo/Icon/SVG/Triqs_Icon_RGB_Full.svg deleted file mode 100755 index 76d6707..0000000 --- a/doc/_static/triqs_logo/Icon/SVG/Triqs_Icon_RGB_Full.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/doc/_static/triqs_logo/Icon/SVG/Triqs_Icon_RGB_White.svg b/doc/_static/triqs_logo/Icon/SVG/Triqs_Icon_RGB_White.svg deleted file mode 100755 index 4fbd963..0000000 --- a/doc/_static/triqs_logo/Icon/SVG/Triqs_Icon_RGB_White.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/doc/_static/triqs_logo/Logo/JPG/Triqs_Logo_RGB_Black.jpg b/doc/_static/triqs_logo/Logo/JPG/Triqs_Logo_RGB_Black.jpg deleted file mode 100755 index a9206e0..0000000 Binary files a/doc/_static/triqs_logo/Logo/JPG/Triqs_Logo_RGB_Black.jpg and /dev/null differ diff --git a/doc/_static/triqs_logo/Logo/JPG/Triqs_Logo_RGB_Full.jpg b/doc/_static/triqs_logo/Logo/JPG/Triqs_Logo_RGB_Full.jpg deleted file mode 100755 index 58e6a81..0000000 Binary files a/doc/_static/triqs_logo/Logo/JPG/Triqs_Logo_RGB_Full.jpg and /dev/null differ diff --git a/doc/_static/triqs_logo/Logo/SVG/Triqs_Logo_RGB_Black.svg b/doc/_static/triqs_logo/Logo/SVG/Triqs_Logo_RGB_Black.svg deleted file mode 100755 index 27ff0f4..0000000 --- a/doc/_static/triqs_logo/Logo/SVG/Triqs_Logo_RGB_Black.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/doc/_static/triqs_logo/Logo/SVG/Triqs_Logo_RGB_Full.svg b/doc/_static/triqs_logo/Logo/SVG/Triqs_Logo_RGB_Full.svg deleted file mode 100755 index 149bdb6..0000000 --- a/doc/_static/triqs_logo/Logo/SVG/Triqs_Logo_RGB_Full.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/doc/_static/triqs_logo/Logo/SVG/Triqs_Logo_RGB_White.svg b/doc/_static/triqs_logo/Logo/SVG/Triqs_Logo_RGB_White.svg deleted file mode 100755 index eb273f9..0000000 --- a/doc/_static/triqs_logo/Logo/SVG/Triqs_Logo_RGB_White.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/doc/_static/triqs_logo/triqs_favicon.ico b/doc/_static/triqs_logo/triqs_favicon.ico deleted file mode 100644 index 9e20d73..0000000 Binary files a/doc/_static/triqs_logo/triqs_favicon.ico and /dev/null differ diff --git a/doc/conf.py.in b/doc/conf.py.in index aadfeac..0ac309b 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# TRIQS documentation build configuration file +# documentation build configuration file import sys sys.path.insert(0, "@CMAKE_CURRENT_SOURCE_DIR@/sphinxext") @@ -66,9 +66,6 @@ html_theme = 'sphinx_rtd_theme' # this loads the custom css file to change the page width html_style = 'css/custom.css' -html_favicon = '@CMAKE_CURRENT_SOURCE_DIR@/_static/triqs_logo/triqs_favicon.ico' -#html_logo = '@CMAKE_CURRENT_SOURCE_DIR@/logos/logo.png' - # options for the the rtd theme html_theme_options = { 'logo_only': False, @@ -99,7 +96,7 @@ plot_include_source = True plot_html_show_source_link = False plot_html_show_formats = False -intersphinx_mapping = {'python': ('https://docs.python.org/3.11', None), 'triqslibs': ('https://triqs.github.io/triqs/latest', None)} +intersphinx_mapping = {'python': ('https://docs.python.org/3.11', None)} # open links in new tab instead of same window from sphinx.writers.html import HTMLTranslator diff --git a/doc/index.rst b/doc/index.rst index 94054b8..ddecd5e 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -14,7 +14,7 @@ app4triqs :target: https://github.com/triqs/app4triqs -An example application using cpp2py and :ref:`TRIQS `. +An example application using cpp2py. This documentation is generated based on `rst `_ files and the comments in the sources and headers. diff --git a/doc/install.rst b/doc/install.rst index 1c7766b..6674c16 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -8,13 +8,7 @@ Install app4triqs Compiling app4triqs from source =============================== -.. note:: To guarantee reproducibility in scientific calculations we strongly recommend the use of a stable `release `_ of both TRIQS and its applications. - -Prerequisites -------------- - -#. The :ref:`TRIQS ` library, see :ref:`TRIQS installation instruction `. - In the following, we assume that TRIQS is installed in the directory ``path_to_triqs``. +.. note:: To guarantee reproducibility in scientific calculations we strongly recommend the use of a stable `release `_ of app4triqs. Installation steps ------------------ @@ -27,13 +21,9 @@ Installation steps $ mkdir app4triqs.build && cd app4triqs.build -#. Ensure that your shell contains the TRIQS environment variables by sourcing the ``triqsvars.sh`` file from your TRIQS installation:: - - $ source path_to_triqs/share/triqs/triqsvars.sh - #. In the build directory call cmake, including any additional custom CMake options, see below:: - $ cmake ../app4triqs.src + $ cmake -DCMAKE_INSTALL_PREFIX=path_to_install_dir ../app4triqs.src #. Compile the code, run the tests and install the application:: @@ -41,12 +31,9 @@ Installation steps $ make test $ make install -Version compatibility ---------------------- +Versions +-------- -Keep in mind that the version of ``app4triqs`` must be compatible with your TRIQS library version, -see :ref:`TRIQS website `. -In particular the Major and Minor Version numbers have to be the same. To use a particular version, go into the directory with the sources, and look at all available versions:: $ cd app4triqs.src && git tag @@ -64,14 +51,14 @@ The compilation of ``app4triqs`` can be configured using CMake-options:: cmake ../app4triqs.src -DOPTION1=value1 -DOPTION2=value2 ... -+-----------------------------------------------------------------+-----------------------------------------------+ -| Options | Syntax | -+=================================================================+===============================================+ -| Specify an installation path other than path_to_triqs | -DCMAKE_INSTALL_PREFIX=path_to_app4triqs | -+-----------------------------------------------------------------+-----------------------------------------------+ -| Build in Debugging Mode | -DCMAKE_BUILD_TYPE=Debug | -+-----------------------------------------------------------------+-----------------------------------------------+ -| Disable testing (not recommended) | -DBuild_Tests=OFF | -+-----------------------------------------------------------------+-----------------------------------------------+ -| Build the documentation | -DBuild_Documentation=ON | -+-----------------------------------------------------------------+-----------------------------------------------+ ++-----------------------------------------+-----------------------------------------------+ +| Options | Syntax | ++=========================================+===============================================+ +| Specify an installation path | -DCMAKE_INSTALL_PREFIX=path_to_app4triqs | ++-----------------------------------------+-----------------------------------------------+ +| Build in Debugging Mode | -DCMAKE_BUILD_TYPE=Debug | ++-----------------------------------------+-----------------------------------------------+ +| Disable testing (not recommended) | -DBuild_Tests=OFF | ++-----------------------------------------+-----------------------------------------------+ +| Build the documentation | -DBuild_Documentation=ON | ++-----------------------------------------+-----------------------------------------------+ diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt index 748dc4a..fbb0e42 100644 --- a/packaging/CMakeLists.txt +++ b/packaging/CMakeLists.txt @@ -2,6 +2,4 @@ configure_file(conda/meta.yaml.in conda/meta.yaml) configure_file(conda/build.sh conda/build.sh COPYONLY) configure_file(conda/conda_build_config.yaml conda/conda_build_config.yaml COPYONLY) -configure_file(TRIQS-app4triqs-foss-2021b.eb.in TRIQS-app4triqs-foss-2021b.eb) - - +configure_file(app4triqs-foss-2021b.eb.in app4triqs-foss-2021b.eb) diff --git a/packaging/Dockerfile.centos-gcc b/packaging/Dockerfile.centos-gcc new file mode 100644 index 0000000..25bc70b --- /dev/null +++ b/packaging/Dockerfile.centos-gcc @@ -0,0 +1,38 @@ +FROM centos:8 + +RUN dnf -y install dnf-plugins-core epel-release && \ + dnf config-manager --set-enabled PowerTools && \ + dnf -y update && \ + dnf -y install \ + blas-devel \ + boost-devel \ + cmake3 \ + fftw-devel \ + gcc-c++ \ + gcc-gfortran \ + git \ + vim \ + lldb \ + gmp-devel \ + hdf5-devel \ + lapack-devel \ + make \ + openmpi-devel \ + python3-devel \ + python3-mako \ + python3-matplotlib \ + python3-mpi4py-openmpi \ + python3-numpy \ + python3-pip \ + python3-pytz \ + python3-scipy \ + python3-virtualenv + +# for openmpi +ENV PYTHON_VERSION=3.6 \ + CC=gcc CXX=g++ \ + PATH=/usr/lib64/openmpi/bin:${PATH} \ + LD_LIBRARY_PATH=/usr/lib64/openmpi/lib \ + PKG_CONFIG_PATH=/usr/lib64/openmpi/lib/pkgconfig \ + MPI_PYTHON3_SITEARCH=/usr/lib64/python3.6/site-packages/openmpi \ + OMPI_MCA_btl=^uct diff --git a/packaging/Dockerfile.msan b/packaging/Dockerfile.msan new file mode 100644 index 0000000..94880a6 --- /dev/null +++ b/packaging/Dockerfile.msan @@ -0,0 +1,116 @@ +FROM --platform=linux/amd64 ubuntu:23.04 +ARG APPNAME=app4triqs +ARG LLVM=17 +ARG NTHREAD=10 + +RUN apt-get update && apt-get install -y lsb-release wget software-properties-common && \ + wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && chmod +x /tmp/llvm.sh && /tmp/llvm.sh ${LLVM} && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y \ + clang-${LLVM} \ + cmake \ + g++-12 \ + gfortran \ + git \ + vim \ + lldb-${LLVM} \ + hdf5-tools \ + libblas-dev \ + libboost-dev \ + libclang-${LLVM}-dev \ + libomp-${LLVM}-dev \ + libfftw3-dev \ + libgfortran5 \ + libgmp-dev \ + libssl-dev \ + ninja-build \ + pkg-config \ + python3-clang-${LLVM} \ + python3-dev \ + python3-mako \ + python3-matplotlib \ + python3-numpy \ + python3-pip \ + python3-scipy + +ENV PYTHON_VERSION=3.11 \ + CC=clang-${LLVM} CXX=clang++-${LLVM} \ + LLVM_ROOT=/usr/lib/llvm-${LLVM} + +# Build libcxx and libcxxabi with MSAN +# c.f. https://github.com/google/sanitizers/wiki/MemorySanitizerLibcxxHowTo +RUN git clone https://github.com/llvm/llvm-project --branch release/${LLVM}.x --depth 1 -c advice.detachedHead=false /tmp/llvm_src && \ + mkdir /tmp/llvm_build && cd /tmp/llvm_build && \ + cmake /tmp/llvm_src/runtimes -G Ninja \ + -DLLVM_USE_SANITIZER=MemoryWithOrigins \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX=${LLVM_ROOT} \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" && \ + ninja -j${NTHREAD} install-cxx install-cxxabi + +# Build Environment using MSAN +# c.f. https://libcxx.llvm.org/UsingLibcxx.html#using-a-custom-built-libc +ENV MSAN_FLAGS="-fsanitize=memory -fno-omit-frame-pointer -fsanitize-recover=all -fsanitize-memory-track-origins -ggdb3" \ + CUSTOM_LIBCXX_FLAGS="-nostdinc++ -nostdlib++ -isystem${LLVM_ROOT}/include/c++/v1 -L${LLVM_ROOT}/lib -Wl,-rpath,${LLVM_ROOT}/lib -lc++ -lc++abi" +ENV CXXFLAGS="$MSAN_FLAGS -Wno-unused-command-line-argument $CUSTOM_LIBCXX_FLAGS" \ + CFLAGS="$MSAN_FLAGS" \ + MSAN_OPTIONS=symbolize=1:halt_on_error=1 \ + MSAN_SYMBOLIZER_PATH=${LLVM_ROOT}/bin/llvm-symbolizer + +# Static zlib using fPIC to be linked into hdf5 +ADD https://www.zlib.net/zlib-1.3.tar.gz /tmp/ +RUN cd /tmp && tar xf /tmp/zlib-1.3.tar.gz && cd zlib-1.3 && \ + CFLAGS="-fPIC $CFLAGS" ./configure --prefix=/opt/zlib && make -j${NTHREAD} && make install && \ + cd /tmp #&& rm -rf /tmp/zlib* + +# HDF5 +ADD https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_14_2.tar.gz /tmp/ +RUN cd /tmp && tar xf /tmp/hdf5-1_14_2.tar.gz && chmod 1777 . && \ + mkdir build && cd build && \ + cmake /tmp/hdf5-hdf5-1_14_2 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/hdf5 \ + -DHDF5_ENABLE_Z_LIB_SUPPORT=ON -DZLIB_LIBRARY=/opt/zlib/lib/libz.a -DZLIB_INCLUDE_DIR:PATH=/opt/zlib/include && \ + make -j${NTHREAD} && make install && \ + cd /tmp && rm -rf /tmp/hdf5-* /tmp/build +ENV HDF5_ROOT=/opt/hdf5 + +# libevent +ADD https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz /tmp/ +RUN cd /tmp && tar xf /tmp/libevent-2.1.12-stable.tar.gz && cd libevent-2.1.12-stable && \ + ./configure --prefix=/opt/openmpi --enable-shared && make -j${NTHREAD} && make install && \ + cd /tmp && rm -rf /tmp/libevent* + +# hwloc +ADD https://download.open-mpi.org/release/hwloc/v2.9/hwloc-2.9.3.tar.bz2 /tmp/ +COPY packaging/hwloc.patch /tmp/ +RUN cd /tmp && tar xf /tmp/hwloc-2.9.3.tar.bz2 && cd hwloc-2.9.3 && patch -p0 -i /tmp/hwloc.patch && \ + ./configure --prefix=/opt/openmpi --enable-shared && make -j${NTHREAD} && make install && \ + cd /tmp && rm -rf /tmp/hwloc* + +# OpenMPI +ADD https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.5.tar.bz2 /tmp/ +RUN cd /tmp && tar xf /tmp/openmpi-4.1.5.tar.bz2 && cd openmpi-4.1.5 && \ + ./configure --prefix=/opt/openmpi --enable-shared --disable-mpi-fortran --disable-pty-support --with-hwloc=/opt/openmpi --with-libevent=/opt/openmpi && make -j${NTHREAD} && make install && \ + cd /tmp && rm -rf /tmp/openmpi-4.1.5* +ENV MPI_HOME=/opt/openmpi \ + MPICC=/opt/openmpi/bin/mpicc + +# Use libflame to provide blas / lapack +RUN git clone https://github.com/Wentzell/libflame /tmp/libflame && cd /tmp/libflame && \ + ./configure --prefix=/opt/libflame --enable-lapack2flame --enable-builtin-blas --build=x86_64-unknown-linux-gnu && make -j${NTHREAD} && make install && \ + cd /tmp && rm -rf /tmp/libflame + +RUN useradd -m build + +ENV SRC=/src \ + BUILD=/home/build \ + INSTALL=/usr/local \ + PYTHONPATH=/usr/local/lib/python${PYTHON_VERSION}/site-packages \ + CMAKE_PREFIX_PATH=/usr/lib/cmake/$APPNAME + +COPY . ${SRC}/$APPNAME +WORKDIR ${BUILD}/$APPNAME +RUN chown -R build . ${SRC}/$APPNAME +USER build +RUN cmake $SRC/$APPNAME -DCMAKE_INSTALL_PREFIX=$INSTALL -DCMAKE_BUILD_TYPE=Debug -DPythonSupport=OFF -DMSAN=ON \ + -DLAPACK_LIBRARIES="/opt/libflame/lib/libflame.a;gfortran" -DBLAS_LIBRARIES=/opt/libflame/lib/libflame.a && \ + make -j${NTHREAD} +RUN cd test/c++ && make test CTEST_OUTPUT_ON_FAILURE=1 || true diff --git a/packaging/Dockerfile.sanitize b/packaging/Dockerfile.sanitize new file mode 100644 index 0000000..17a6355 --- /dev/null +++ b/packaging/Dockerfile.sanitize @@ -0,0 +1,43 @@ +FROM ubuntu:22.04 +ARG LLVM=15 + +RUN apt-get update && apt-get install -y lsb-release wget software-properties-common && \ + wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && chmod +x /tmp/llvm.sh && /tmp/llvm.sh ${LLVM} && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y \ + clang-${LLVM} \ + cmake \ + g++-12 \ + gfortran \ + git \ + vim \ + lldb-${LLVM} \ + hdf5-tools \ + libboost-dev \ + libclang-${LLVM}-dev \ + libc++-${LLVM}-dev \ + libc++abi-${LLVM}-dev \ + libomp-${LLVM}-dev \ + libfftw3-dev \ + libgfortran5 \ + libgmp-dev \ + libhdf5-dev \ + libopenblas-dev \ + libopenmpi-dev \ + openmpi-bin \ + openmpi-common \ + openmpi-doc \ + python3-clang-${LLVM} \ + python3-dev \ + python3-mako \ + python3-matplotlib \ + python3-mpi4py \ + python3-numpy \ + python3-pip \ + python3-scipy + +ENV PYTHON_VERSION=3.10 \ + CC=clang-${LLVM} CXX=clang++-${LLVM} CXXFLAGS="-stdlib=libc++" \ + ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-${LLVM}/bin/llvm-symbolizer \ + ASAN_OPTIONS=symbolize=1:detect_leaks=0:alloc_dealloc_mismatch=0 \ + UBSAN_OPTIONS=symbolize=1:print_stacktrace=1:halt_on_error=1 +RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${LLVM} 60 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM} --slave /usr/bin/clang-cpp clang-cpp /usr/bin/clang-cpp-${LLVM} diff --git a/packaging/Dockerfile.ubuntu-clang b/packaging/Dockerfile.ubuntu-clang new file mode 100644 index 0000000..ba18c1b --- /dev/null +++ b/packaging/Dockerfile.ubuntu-clang @@ -0,0 +1,49 @@ +FROM ubuntu:22.04 +ARG LLVM=15 + +# This platform includes dependencies for building docs +RUN apt-get update && apt-get install -y lsb-release wget software-properties-common && \ + wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && chmod +x /tmp/llvm.sh && /tmp/llvm.sh ${LLVM} && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y \ + clang-${LLVM} \ + cmake \ + g++-12 \ + gfortran \ + git \ + vim \ + lldb-${LLVM} \ + hdf5-tools \ + libboost-dev \ + libclang-${LLVM}-dev \ + libc++-${LLVM}-dev \ + libc++abi-${LLVM}-dev \ + libomp-${LLVM}-dev \ + libfftw3-dev \ + libgfortran5 \ + libgmp-dev \ + libhdf5-dev \ + libopenblas-dev \ + libopenmpi-dev \ + openmpi-bin \ + openmpi-common \ + openmpi-doc \ + pandoc \ + python3-clang-${LLVM} \ + python3-dev \ + python3-mako \ + python3-matplotlib \ + python3-mpi4py \ + python3-numpy \ + python3-numpydoc \ + python3-pip \ + python3-scipy \ + python3-ipython && \ + #python3-sphinx \ + #python3-nbsphinx \ + #python3-sphinx-rtd-theme && \ + pip3 install myst-parser linkify-it-py && \ + pip3 install sphinx nbsphinx sphinx-rtd-theme + +ENV PYTHON_VERSION=3.10 \ + CC=clang-${LLVM} CXX=clang++-${LLVM} CXXFLAGS="-stdlib=libc++" +RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${LLVM} 60 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM} --slave /usr/bin/clang-cpp clang-cpp /usr/bin/clang-cpp-${LLVM} diff --git a/packaging/Dockerfile.ubuntu-gcc b/packaging/Dockerfile.ubuntu-gcc new file mode 100644 index 0000000..5532170 --- /dev/null +++ b/packaging/Dockerfile.ubuntu-gcc @@ -0,0 +1,30 @@ +FROM ubuntu:22.04 + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + cmake \ + g++-12 \ + gfortran \ + git \ + vim \ + lldb-13 \ + hdf5-tools \ + libboost-dev \ + libfftw3-dev \ + libgfortran5 \ + libgmp-dev \ + libhdf5-dev \ + libopenblas-dev \ + libopenmpi-dev \ + openmpi-bin \ + openmpi-common \ + openmpi-doc \ + python3-dev \ + python3-mako \ + python3-matplotlib \ + python3-mpi4py \ + python3-numpy \ + python3-pip \ + python3-scipy + +ENV PYTHON_VERSION=3.10 \ + CC=gcc-12 CXX=g++-12 diff --git a/packaging/Dockerfile.ubuntu-intel b/packaging/Dockerfile.ubuntu-intel new file mode 100644 index 0000000..a44c613 --- /dev/null +++ b/packaging/Dockerfile.ubuntu-intel @@ -0,0 +1,35 @@ +FROM intel/oneapi-hpckit:2023.2.1-devel-ubuntu22.04 +ARG LLVM=15 + +# Fix broken gpg keyfile +RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \ + | gpg --dearmor | tee /usr/share/keyrings/intel-oneapi-archive-keyring.gpg > /dev/null + +RUN apt-get update && apt-get install -y lsb-release wget software-properties-common && \ + wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && chmod +x /tmp/llvm.sh && /tmp/llvm.sh ${LLVM} && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y \ + g++-12 \ + git \ + vim \ + lldb-${LLVM} \ + hdf5-tools \ + libboost-dev \ + libclang-${LLVM}-dev \ + libc++-${LLVM}-dev \ + libc++abi-${LLVM}-dev \ + libfftw3-dev \ + libgmp-dev \ + libhdf5-dev \ + python3-clang-${LLVM} \ + python3-dev \ + python3-mako \ + python3-matplotlib \ + python3-mpi4py \ + python3-numpy \ + python3-pip \ + python3-scipy + +RUN pip install cmake + +ENV PYTHON_VERSION=3.10 \ + CC=icx CXX=icpx CXXFLAGS="-stdlib=libc++" diff --git a/packaging/TRIQS-app4triqs-foss-2021b.eb.in b/packaging/app4triqs-foss-2021b.eb.in similarity index 94% rename from packaging/TRIQS-app4triqs-foss-2021b.eb.in rename to packaging/app4triqs-foss-2021b.eb.in index c5c96f2..5bf9f7e 100644 --- a/packaging/TRIQS-app4triqs-foss-2021b.eb.in +++ b/packaging/app4triqs-foss-2021b.eb.in @@ -1,6 +1,6 @@ easyblock = 'CMakeMake' -name = 'TRIQS-app4triqs' +name = 'app4triqs' version = '@PROJECT_VERSION@' homepage = 'https://triqs.github.io/app4triqs/' @@ -9,7 +9,7 @@ description = """ """ docurls = ['https://triqs.github.io/app4triqs/%(version_major_minor)s.x/'] -software_license = 'LicenseGPLv3' +software_license = 'LicenseApache2' toolchain = {'name': 'foss', 'version': '2021b'} toolchainopts = {'pic': True, 'usempi': True} @@ -27,7 +27,6 @@ dependencies = [ ('GMP', '6.2.1'), ('HDF5', '1.10.7'), ('Mako', '1.1.4'), - ('TRIQS', '3.2.0'), ('NFFT', '3.5.2') ] diff --git a/packaging/conda/build.sh b/packaging/conda/build.sh index 740a84d..2532460 100644 --- a/packaging/conda/build.sh +++ b/packaging/conda/build.sh @@ -10,8 +10,6 @@ export OMPI_MCA_rmaps_base_oversubscribe=yes export OMPI_MCA_btl_vader_single_copy_mechanism=none mpiexec="mpiexec --allow-run-as-root" -source $PREFIX/share/triqs/triqsvars.sh - cmake \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/packaging/conda/meta.yaml.in b/packaging/conda/meta.yaml.in index bad6e1c..1b14c68 100644 --- a/packaging/conda/meta.yaml.in +++ b/packaging/conda/meta.yaml.in @@ -19,16 +19,12 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} host: - - triqs {{ '.'.join(version.split('.')[:2]) }} - - boost-cpp - hdf5 - {{ mpi }} - libblas - liblapack - python run: - - {{ pin_compatible("triqs", max_pin="x.x") }} - - boost-cpp - hdf5 - {{ mpi }} - libblas @@ -46,8 +42,8 @@ test: about: home: https://triqs.github.io/app4triqs - license: GPL-3.0-or-later - license_family: GPL + license: Apache-2.0 + license_family: Apache license_file: LICENSE.txt summary: 'An application based on the TRIQS library' diff --git a/packaging/hwloc.patch b/packaging/hwloc.patch new file mode 100644 index 0000000..6ac9b58 --- /dev/null +++ b/packaging/hwloc.patch @@ -0,0 +1,13 @@ +diff -ru include/private/cpuid-x86.h.orig include/private/cpuid-x86.h +index 2758afe04..8f7acd894 100644 +--- include/private/cpuid-x86.h.orig ++++ include/private/cpuid-x86.h +@@ -62,6 +62,8 @@ static __hwloc_inline void hwloc_x86_cpuid(unsigned *eax, unsigned *ebx, unsigne + #else /* HWLOC_HAVE_MSVC_CPUIDEX */ + /* Note: gcc might want to use bx or the stack for %1 addressing, so we can't + * use them :/ */ ++ /* MSAN FIX */ ++ *ebx = *edx = 0; + #ifdef HWLOC_X86_64_ARCH + hwloc_uint64_t sav_rbx; + __asm__( diff --git a/python/app4triqs/CMakeLists.txt b/python/app4triqs/CMakeLists.txt index 753f314..12c3dad 100644 --- a/python/app4triqs/CMakeLists.txt +++ b/python/app4triqs/CMakeLists.txt @@ -10,9 +10,9 @@ foreach(file ${python_sources}) endforeach() # Install python files to proper location -set(PYTHON_LIB_DEST ${TRIQS_PYTHON_LIB_DEST_ROOT}/${PROJECT_NAME}) +set(PYTHON_LIB_DEST ${CPP2PY_PYTHON_LIB_DEST_ROOT}/${PROJECT_NAME}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version.py DESTINATION ${PYTHON_LIB_DEST}) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${TRIQS_PYTHON_LIB_DEST_ROOT} FILES_MATCHING PATTERN "*.py" PATTERN "*_desc.py" EXCLUDE) +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CPP2PY_PYTHON_LIB_DEST_ROOT} FILES_MATCHING PATTERN "*.py" PATTERN "*_desc.py" EXCLUDE) # Build and install any python modules foreach(gen ${wrap_generators}) @@ -21,6 +21,6 @@ foreach(gen ${wrap_generators}) get_filename_component(module_dir ${gen} DIRECTORY) add_cpp2py_module(NAME ${module_name} DIRECTORY ${module_dir}) add_library(${PROJECT_NAME}::${module_name} ALIAS ${module_name}) - target_link_libraries(${module_name} ${PROJECT_NAME}_c triqs_py) + target_link_libraries(${module_name} ${PROJECT_NAME}_c) install(TARGETS ${module_name} DESTINATION ${PYTHON_LIB_DEST}/${module_dir}) endforeach() diff --git a/python/app4triqs/app4triqs_module_desc.py b/python/app4triqs/app4triqs_module_desc.py index 161e72f..92b3335 100644 --- a/python/app4triqs/app4triqs_module_desc.py +++ b/python/app4triqs/app4triqs_module_desc.py @@ -1,5 +1,5 @@ # Generated automatically using the command : -# c++2py ../../c++/app4triqs/app4triqs.hpp -p --members_read_only -N app4triqs -a app4triqs -m app4triqs_module -o app4triqs_module --moduledoc="The app4triqs python module" -C triqs --cxxflags="-std=c++17" --target_file_only +# c++2py ../../c++/app4triqs/app4triqs.hpp -p --members_read_only -N app4triqs -a app4triqs -m app4triqs_module -o app4triqs_module --moduledoc="The app4triqs python module" --cxxflags="-std=c++17" --target_file_only from cpp2py.wrap_generator import * # The module diff --git a/python/app4triqs/version.py.in b/python/app4triqs/version.py.in index 2d63daf..475c61e 100644 --- a/python/app4triqs/version.py.in +++ b/python/app4triqs/version.py.in @@ -22,11 +22,10 @@ ################################################################################ version = "@PROJECT_VERSION@" -triqs_hash = "@TRIQS_GIT_HASH@" @PROJECT_NAME@_hash = "@PROJECT_GIT_HASH@" def show_version(): print("\nYou are using @PROJECT_NAME@ version %s\n"%version) def show_git_hash(): - print("\nYou are using @PROJECT_NAME@ git hash %s based on triqs git hash %s\n"%("@PROJECT_GIT_HASH@", triqs_hash)) + print("\nYou are using @PROJECT_NAME@ git hash %s\n"%("@PROJECT_GIT_HASH@")) diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt index 8d258a5..46b4d8d 100644 --- a/share/CMakeLists.txt +++ b/share/CMakeLists.txt @@ -1,7 +1,6 @@ add_subdirectory(cmake) if(NOT IS_SUBPROJECT - AND NOT CMAKE_INSTALL_PREFIX STREQUAL TRIQS_ROOT AND NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr" AND NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr/local" ) diff --git a/share/app4triqs.modulefile.in b/share/app4triqs.modulefile.in index 2c9befe..6b6289d 100644 --- a/share/app4triqs.modulefile.in +++ b/share/app4triqs.modulefile.in @@ -20,10 +20,6 @@ proc ModulesHelp { } { puts stderr "Git hash: $git_hash" } -# You may need to edit the next line if the triqs module -# is installed under a different name in your setup. -prereq triqs/@TRIQS_VERSION@ - # Only one version of @PROJECT_NAME@ can be loaded at a time conflict $name diff --git a/share/cmake/Modules/Findsanitizer.cmake b/share/cmake/Modules/Findsanitizer.cmake new file mode 100644 index 0000000..5cafd8b --- /dev/null +++ b/share/cmake/Modules/Findsanitizer.cmake @@ -0,0 +1,138 @@ +# Copyright Nils Wentzell 2018 +# Distributed under the GNU GENERAL PUBLIC LICENSE Version 3.0. +# See accompanying file LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt +# +# This cmake find module looks for the LLVM Sanitizer Runtime Librariies +# It sets up SANITIZER_RT_PRELOAD and ${COMPONENT}_RT_LIBRARY for each +# requested component. +# +# Use this module by invoking find_package with the form:: +# +# find_package(sanitizer [REQUIRED] [asan] [ubsan]) +# +# Results are reported in:: +# +# SANITIZER_RT_PRELOAD Environment setting to load all Sanitizer Runtime Libraries +# ${COMPONENT}_RT_LIBRARY Individual Sanitizer Runtime Library + +if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") + execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-resource-dir + OUTPUT_VARIABLE clang_resource_dir OUTPUT_STRIP_TRAILING_WHITESPACE) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(search_paths ${clang_resource_dir}/lib/darwin ${clang_resource_dir}/../) + set(suffix _osx_dynamic) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(search_paths ${clang_resource_dir}/lib/linux ${clang_resource_dir}/../) + set(suffix -${CMAKE_SYSTEM_PROCESSOR}) + else() + message(FATAL_ERROR "Unknown platform") + endif() + if(${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL 13.0.0) + execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-runtime-dir + OUTPUT_VARIABLE clang_runtime_dir OUTPUT_STRIP_TRAILING_WHITESPACE) + list(APPEND search_paths ${clang_runtime_dir}) + endif() +elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") + execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-libgcc-file-name + OUTPUT_VARIABLE libgcc_file OUTPUT_STRIP_TRAILING_WHITESPACE) + get_filename_component(search_path ${libgcc_file} DIRECTORY) +else() + message(FATAL_ERROR "Sanitizer is not available for your compiler") +endif() + +set(sanitizer_rt_libraries ${SANITIZER_RT_LIBRARIES}) +set(required_vars "") + +foreach(component ${${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS}) + if(${component} STREQUAL "msan" OR TARGET ${component}) + continue() + endif() + + string(TOUPPER ${component} COMPONENT) + if((${component} STREQUAL "ubsan") AND (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") AND ASAN_RT_LIBRARY) + set(component ubsan_minimal) + endif() + + set(prefix clang_rt.) + find_library(${COMPONENT}_RT_LIBRARY + NAMES ${prefix}${component} ${prefix}${component}_standalone ${prefix}${component}${suffix} ${prefix}${component}_standalone${suffix} + PATHS ${search_paths}) + mark_as_advanced(${COMPONENT}_RT_LIBRARY) + + # Imported target + add_library(lib${component}_rt SHARED IMPORTED) + set_property(TARGET lib${component}_rt PROPERTY IMPORTED_LOCATION ${${COMPONENT}_RT_LIBRARY}) + + if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED_${component}) + list(APPEND required_vars ${COMPONENT}_RT_LIBRARY) + endif() + if(DEFINED sanitizer_rt_libraries AND NOT ${COMPONENT}_RT_LIBRARY MATCHES sanitizer_rt_libraries) + string(APPEND sanitizer_rt_libraries :${${COMPONENT}_RT_LIBRARY}) + else() + set(sanitizer_rt_libraries ${${COMPONENT}_RT_LIBRARY}) + endif() +endforeach() + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(preload_var DYLD_INSERT_LIBRARIES) +else() + set(preload_var LD_PRELOAD) +endif() + +set(SANITIZER_RT_LIBRARIES ${sanitizer_rt_libraries} CACHE INTERNAL "Runtime shared libraries needed to load the LLVM sanitizers") +mark_as_advanced(SANITIZER_RT_LIBRARIES) +set(SANITIZER_RT_PRELOAD ${preload_var}=${SANITIZER_RT_LIBRARIES} CACHE INTERNAL "Preload command for santitizer runtime libraries") +mark_as_advanced(SANITIZER_RT_PRELOAD) + +# ----- Create Interface Targets ----- + +# Address Sanitizer +if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED_asan AND NOT TARGET asan) + add_library(asan INTERFACE) + target_compile_options(asan INTERFACE -fsanitize=address -fno-omit-frame-pointer -ggdb3) + target_link_libraries(asan INTERFACE "-fsanitize=address -fno-omit-frame-pointer$<$: -fuse-ld=gold>") + if(NOT DEFINED ENV{ASAN_OPTIONS}) + message(WARNING "ASAN_OPTIONS is not set. Consider setting ASAN_OPTIONS=symbolize=1:detect_leaks=0:halt_on_error=1 when running tests") + endif() +endif() + +# Undefined Behavior Sanitizer +if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED_ubsan AND NOT TARGET ubsan) + add_library(ubsan INTERFACE) + target_compile_options(ubsan INTERFACE -fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-omit-frame-pointer -ggdb3) + target_link_libraries(ubsan INTERFACE "-fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-omit-frame-pointer$<$: -fuse-ld=gold>") + if(NOT DEFINED ENV{UBSAN_OPTIONS}) + message(WARNING "UBSAN_OPTIONS is not set. Consider setting UBSAN_OPTIONS=symbolize=1:print_stacktrace=1:halt_on_error=1 when running tests") + endif() +endif() + +# Memory Sanitizer +if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED_msan AND NOT TARGET msan) + if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED_asan OR ${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED_ubsan OR ${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED_tsan) + message(FATAL_ERROR "Memory Sanitizer cannot be used with other sanitizers") + endif() + add_library(msan INTERFACE) + target_compile_options(msan INTERFACE -fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -ggdb3) + target_link_libraries(msan INTERFACE "-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer$<$: -fuse-ld=gold>") + if(NOT DEFINED ENV{MSAN_OPTIONS}) + message(WARNING "MSAN_OPTIONS is not set. Consider setting MBSAN_OPTIONS=symbolize=1 when running tests") + endif() +endif() + +# Thread Sanitizer +if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED_tsan AND NOT TARGET tsan) + add_library(tsan INTERFACE) + target_compile_options(tsan INTERFACE -fsanitize=thread -fno-omit-frame-pointer -ggdb3) + target_link_libraries(tsan INTERFACE "-fsanitize=thread -fno-omit-frame-pointer$<$: -fuse-ld=gold>") + if(NOT DEFINED ENV{TSAN_OPTIONS}) + message(WARNING "TSAN_OPTIONS is not set. Consider setting TSAN_OPTIONS=symbolize=1 when running tests") + endif() +endif() + +# ------------------------------------ + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args("sanitizer" + REQUIRED_VARS SANITIZER_RT_PRELOAD ${required_vars} + FAIL_MESSAGE "Sanitizer Runtime Libraries not found! Consider installing for additional checks!" +) diff --git a/test/Dockerfile.msan b/test/Dockerfile.msan new file mode 100644 index 0000000..10754dc --- /dev/null +++ b/test/Dockerfile.msan @@ -0,0 +1,68 @@ +FROM ubuntu:disco +ENV LLVM_MAJOR_VERSION=9 +ENV APPNAME=myapp + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + clang-${LLVM_MAJOR_VERSION} \ + cmake \ + g++ \ + gfortran \ + git \ + libblas-dev \ + libboost-all-dev \ + libclang-${LLVM_MAJOR_VERSION}-dev \ + libfftw3-dev \ + libgfortran3 \ + libgmp-dev \ + zlib1g-dev \ + intel-mkl \ + python-clang-${LLVM_MAJOR_VERSION} \ + python-dev \ + python-h5py \ + python-mako \ + python-matplotlib \ + python-numpy \ + python-scipy \ + python-sphinx \ + python-nbsphinx \ + python-pip + +ENV CC=clang-${LLVM_MAJOR_VERSION} CXX=clang++-${LLVM_MAJOR_VERSION} LLVM_VERSION=${LLVM_MAJOR_VERSION}.0.0 + +ADD http://releases.llvm.org/${LLVM_VERSION}/libcxx-${LLVM_VERSION}.src.tar.xz /tmp/ +ADD http://releases.llvm.org/${LLVM_VERSION}/libcxxabi-${LLVM_VERSION}.src.tar.xz /tmp/ +RUN mkdir /tmp/build && cd /tmp/build && \ + tar -C /tmp -xf /tmp/libcxx-${LLVM_VERSION}.src.tar.xz && \ + tar -C /tmp -xf /tmp/libcxxabi-${LLVM_VERSION}.src.tar.xz && \ + cmake /tmp/libcxxabi-${LLVM_VERSION}.src -DLLVM_CONFIG_PATH=/usr/bin/llvm-config-${LLVM_MAJOR_VERSION} -DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-${LLVM_MAJOR_VERSION} -DLIBCXXABI_LIBCXX_PATH=/tmp/libcxx-${LLVM_VERSION}.src -DLLVM_USE_SANITIZER=Memory && make -j2 && make install && \ + rm -rf * && \ + cmake /tmp/libcxx-${LLVM_VERSION}.src -DLLVM_CONFIG_PATH=/usr/bin/llvm-config-${LLVM_MAJOR_VERSION} -DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-${LLVM_MAJOR_VERSION} -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_CXX_ABI_INCLUDE_PATHS=/tmp/libcxxabi-${LLVM_VERSION}.src/include -DLLVM_USE_SANITIZER=Memory && make -j2 install && \ + rm -rf /tmp/libcxx* /tmp/build +ENV CXXFLAGS="-stdlib=libc++ -fsanitize=memory" CFLAGS="-fsanitize=memory" LD_LIBRARY_PATH=/usr/lib/llvm-${LLVM_MAJOR_VERSION}/lib LDFLAGS="-fsanitize=memory" + +RUN update-alternatives --set liblapack.so-x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/libmkl_rt.so && \ + update-alternatives --set libblas.so-x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/libmkl_rt.so + +ADD https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/CMake-hdf5-1.10.5.tar.gz /tmp/ +RUN mkdir /tmp/build && cd /tmp/build && \ + tar -C /tmp -xf /tmp/CMake-hdf5-1.10.5.tar.gz && \ + cmake /tmp/CMake-hdf5-1.10.5/hdf5-1.10.5 -DCMAKE_INSTALL_PREFIX=/usr && make -j2 && make install && \ + rm -rf * && \ + rm -rf /tmp/CMake-hdf5-1.10.5* /tmp/build + +RUN useradd -m build + +ENV SRC=/src \ + BUILD=/home/build \ + INSTALL=/usr/local \ + PYTHONPATH=/usr/local/lib/python2.7/site-packages:${PYTHONPATH} \ + CMAKE_PREFIX_PATH=/usr/lib/cmake/${APPNAME}:${CMAKE_PREFIX_PATH} + +COPY . ${SRC}/${APPNAME} +WORKDIR ${BUILD}/${APPNAME} +RUN chown -R build ${SRC}/${APPNAME} . +USER build +RUN cmake $SRC/nda -DCMAKE_INSTALL_PREFIX=$INSTALL -DMSAN=ON -DPYTHON_EXECUTABLE=$(which python) +RUN make VERBOSE=1 -j8 +ENV MSAN_SYMBOLIZER_PATH=/usr/lib/llvm-${LLVM_MAJOR_VERSION}/bin/llvm-symbolizer CTEST_OUTPUT_ON_FAILURE=1 +RUN make test || true diff --git a/test/c++/basic.cpp b/test/c++/basic.cpp index aecf689..4629cd1 100644 --- a/test/c++/basic.cpp +++ b/test/c++/basic.cpp @@ -1,4 +1,4 @@ -#include +#include #include using namespace app4triqs; diff --git a/test/python/Basic.py b/test/python/Basic.py index c0472fc..d0eba90 100644 --- a/test/python/Basic.py +++ b/test/python/Basic.py @@ -4,7 +4,6 @@ from app4triqs import Toto, chain from h5 import * -from triqs.utility import mpi class test_toto(unittest.TestCase): @@ -16,26 +15,14 @@ def test_add(self): c=a+b self.assertEqual(c, b) - def test_h5(self): - + a=Toto(0) with HDFArchive("f.h5",'w') as A: A["a"] = a with HDFArchive("f.h5",'r') as A: a_read = A["a"] self.assertEqual(a, a_read) - - - def test_mpi(self): - - a=Toto(0) - - if mpi.is_master_node(): - a=Toto(1) - mpi.bcast(a) - - self.assertEqual(a, Toto(1)) class test_chain(unittest.TestCase): diff --git a/test/python/CMakeLists.txt b/test/python/CMakeLists.txt index aa9d877..bcb22bc 100644 --- a/test/python/CMakeLists.txt +++ b/test/python/CMakeLists.txt @@ -10,6 +10,6 @@ set(all_tests Basic) foreach(test ${all_tests}) get_filename_component(test_name ${test} NAME_WE) get_filename_component(test_dir ${test} DIRECTORY) - add_test(NAME Py_${test_name} COMMAND ${TRIQS_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${test_dir}/${test_name}.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir}) - set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${PROJECT_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SANITIZER_RT_PRELOAD}) + add_test(NAME Py_${test_name} COMMAND ${CPP2PY_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${test_dir}/${test_name}.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir}) + set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${PROJECT_BINARY_DIR}/python:${h5_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SANITIZER_RT_PRELOAD}) endforeach()