Skip to content
This repository has been archived by the owner on Mar 20, 2023. It is now read-only.

CMake build options refactoring for Makefile #455

Merged
merged 17 commits into from
Jan 8, 2021
Merged

Conversation

pramodk
Copy link
Collaborator

@pramodk pramodk commented Jan 5, 2021

In order to simplify makefile generation with multiple targets (#442)
this PR refactor some of the CMake flags handling:

  • move all makefile related options into single file MakefileBuildOptions.cmake
  • remove all option processing from extra/CMakeLists.txt
  • minor simplifications in makefile; removing ISPC_INTEROP definition

How to test this?

Usual CMake build options; no changes in CMake

CI_BRANCHES:NEURON_BRANCH=master,SPACK_BRANCH=bbpv-2021-01

  * move all makefile related options into single file MakefileBuildOptions.cmake
  * remove all option processing from extra/CMakeLists.txt
  * fix with neuron linking : type CN_PGI_ACC_FLAGS -> PGI_ACC_FLAGS
@pramodk pramodk requested a review from alkino January 5, 2021 15:01
@pramodk pramodk marked this pull request as ready for review January 5, 2021 23:31
@pramodk
Copy link
Collaborator Author

pramodk commented Jan 6, 2021

Retest this please

2 similar comments
@pramodk
Copy link
Collaborator Author

pramodk commented Jan 6, 2021

Retest this please

@pramodk
Copy link
Collaborator Author

pramodk commented Jan 6, 2021

Retest this please

@pramodk pramodk force-pushed the pramodk/build-opts branch from a5c182d to 38323e4 Compare January 6, 2021 20:21
Copy link
Member

@alkino alkino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Way better than before

CMakeLists.txt Show resolved Hide resolved
extra/nrnivmodl_core_makefile.in Show resolved Hide resolved
@pramodk pramodk force-pushed the pramodk/build-opts branch from bc6f17c to d73f0f1 Compare January 7, 2021 08:56
@pramodk pramodk force-pushed the pramodk/build-opts branch from d73f0f1 to 631f04c Compare January 7, 2021 12:58
  * PG_ACC_BUGS was added when we saw bugs with PGI compiler
    version 16.3
  * Except the case of union, no more real buggy scenario exists
  * So remove all usages of PG_ACC_BUGS
  * Remove some hardcoded ion array size by const variable
@pramodk
Copy link
Collaborator Author

pramodk commented Jan 7, 2021

retest this please

@pramodk
Copy link
Collaborator Author

pramodk commented Jan 8, 2021

Ignoring Simulation stack because it's failing with the latest Spack related errors.

@pramodk pramodk merged commit d4ed738 into master Jan 8, 2021
@pramodk pramodk deleted the pramodk/build-opts branch January 8, 2021 08:23
pramodk added a commit to neuronsimulator/nrn that referenced this pull request Nov 2, 2022
…BlueBrain/CoreNeuron#455)

* CMake build options refactoring for Makefile
   * move all makefile related options into single file MakefileBuildOptions.cmake
   * remove all option processing from extra/CMakeLists.txt
   * fix with neuron linking : type CN_PGI_ACC_FLAGS -> PGI_ACC_FLAGS
* Use PGI archive module because of issue with latest NVHPC modules
* fix ISPC build issue and nrnivmodl-core failure on OSX
* Avoid P2 UC2 ndoes as GPFS is not mounted (HELP-13390)
* Use spack branch only if specified
* Remove use of PG_ACC_BUGS
   * PG_ACC_BUGS was added when we saw bugs with PGI compiler
     version 16.3
   * Except the case of union, no more real buggy scenario exists
   * So remove all usages of PG_ACC_BUGS
   * Remove some hardcoded ion array size by const variable
   * update mod2c to master
* mods files and cpp translated files are in same x86_64/corenrn/mod2c directory

CoreNEURON Repo SHA: BlueBrain/CoreNeuron@d4ed738
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants