Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid using xcrun on non-osx platforms #710

Merged
merged 1 commit into from
Aug 17, 2020
Merged

Conversation

pramodk
Copy link
Member

@pramodk pramodk commented Aug 17, 2020

fixes #709

@pramodk pramodk requested a review from nrnhines August 17, 2020 07:01
@ikitayama
Copy link

What's the best way of pulling your fix to my local repo, considering submodules under it?

@pramodk pramodk requested a review from alexsavulescu August 17, 2020 07:33
@nrnhines nrnhines merged commit 1759767 into master Aug 17, 2020
@nrnhines nrnhines deleted the pramodk/xcrun-fix branch August 17, 2020 12:30
@pramodk
Copy link
Member Author

pramodk commented Aug 17, 2020

@ikitayama : this fix was done in neuron so we don't news to update submodule. You could have changed the branch from where I have created PR (i.e. pramodk/xcrun-fix). As this is merged into master, just do git pull to get latest master.

@ikitayama
Copy link

I've re-ran CMake and built the code, but I still see the error.

@ikitayama
Copy link

Am I supposed to use nrnivmodl-core, instead of nrnivmodl?

@pramodk
Copy link
Member Author

pramodk commented Aug 17, 2020

@ikitayama : did you run cmake .. <params> command after pulling latest changes? On my local machine, the bin/nrnivmodl has following:

if which xcrun; then
    #export SDKROOT=`xcrun --sdk macosx --show-sdk-path`
    #export MACOSX_DEPLOYMENT_TARGET=""
    if [ -z "${MACOSX_DEPLOYMENT_TARGET}" ]; then
        unset MACOSX_DEPLOYMENT_TARGET
    fi
fi

Am I supposed to use nrnivmodl-core, instead of nrnivmodl?

For NEURON, we still use nrnivmodl. We are working another PR to remove need of nrnivmodl-core but this will need another day to review and merge.

@ikitayama
Copy link

@pramodk I do too, but nrnivmodl keeps trying to execute xcrun although which xcrun leaves echo $? 1.

@pramodk
Copy link
Member Author

pramodk commented Aug 18, 2020

@ikitayama : if xcrun statements are commented out with #, I don't understand why the should be executed. Have you installed it with make install?

nrnhines pushed a commit that referenced this pull request Dec 8, 2020
nrnhines pushed a commit that referenced this pull request Dec 10, 2020
olupton pushed a commit that referenced this pull request Dec 7, 2022
…les update on CPU/GPU (#710)

* fixed for watch statements, global variable on GPU
* fixed watch statement code generation described in #679
* fixed global variable update to gpu descrbed in #678
* fixed atomic capture for net_send buffer
* fixed for watch test on GPU
     - Initial block was missing net_send_buffering related codegen
       when net_send was used
     - fix indentation with watch if-else statements
     - net_send_buffer updates from host & device missing
     - net_receieve_buffer code was out of place
* Incorporate BlueBrain/mod2c/pull/63
* Fix CVF CI: INITIAL block shouldn't be executed on ISPC backend
   when mod file uses net_send/net_event method. This is because they
   contain non-compatible code for event buffering used for GPU.
* Fix the weight_index argument for net_send_buffering()
   generated for net_send() call in INITIAL block.
   - See analysis in BlueBrain/nmodl#680

Closes #679, closes #678, closes #675, closes #680
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

A tool xcrun is checked when nrnivmodl is executed on Linux
4 participants