Skip to content

At least Apple arm64 needs last argtype of ctypes._CFuncPtr#2046

Merged
nrnhines merged 7 commits into
masterfrom
hines/rxd-funcptr-fix
Nov 1, 2022
Merged

At least Apple arm64 needs last argtype of ctypes._CFuncPtr#2046
nrnhines merged 7 commits into
masterfrom
hines/rxd-funcptr-fix

Conversation

@nrnhines

Copy link
Copy Markdown
Member

This fixes ctest -R rxdmod_tests::rxd_tests on my Apple M1

The symptom before this is that the called function received a NULL function pointer arg.

@olupton olupton left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks reasonable to me, but I don't have any Apple/arm64 hardware to run any checks on.

@nrnhines

Copy link
Copy Markdown
Member Author

I'm using black, version 21.6b0 (and coding-conventions b62babd0) and am seeing (mistaken?) format changes of the type

-            final_intern_voxels[vox] = [dx**3, seg]
+            final_intern_voxels[vox] = [dx ** 3, seg]^M

What am I doing wrong?

@olupton

olupton commented Oct 31, 2022

Copy link
Copy Markdown
Collaborator

I'm using black, version 21.6b0 (and coding-conventions b62babd0) and am seeing (mistaken?) format changes of the type

-            final_intern_voxels[vox] = [dx**3, seg]
+            final_intern_voxels[vox] = [dx ** 3, seg]^M

What am I doing wrong?

I would guess that it's the black version, but this is nominally pinned here:

version: '[jupyter] ~=22.3'

so it sounds like a bug if it silently accepts/uses a different version...

@codecov-commenter

Copy link
Copy Markdown

Codecov Report

Merging #2046 (b7df3ba) into master (0184c48) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #2046   +/-   ##
=======================================
  Coverage   48.63%   48.63%           
=======================================
  Files         519      519           
  Lines      116059   116059           
=======================================
  Hits        56440    56440           
  Misses      59619    59619           
Impacted Files Coverage Δ
share/lib/python/neuron/rxd/rxd.py 83.89% <ø> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@azure-pipelines

Copy link
Copy Markdown

✔️ b7df3ba -> Azure artifacts URL

@azure-pipelines

Copy link
Copy Markdown

✔️ 6c13552 -> Azure artifacts URL

@nrnhines nrnhines merged commit eb87f3e into master Nov 1, 2022
@nrnhines nrnhines deleted the hines/rxd-funcptr-fix branch November 1, 2022 12:06
ramcdougal pushed a commit that referenced this pull request May 4, 2025
Co-authored-by: Olli Lupton <oliver.lupton@epfl.ch>
nrnhines added a commit that referenced this pull request May 20, 2025
* wheel build generally uses numpy >= 2 for python >= 3.9

* for wheel and mac pgk distributions, rx3d cython compiled with -O1

* adopt PYTHONPATH feature from master _binwrapper.py

* correct nmodl signatures for _getelm and getarg. (windows gcc-15)

* Yet a few more nmodl function signatures.

* Turn off hoc_association test.

* Use platform appropriate separator for PYTHONPATH.

* At least Apple arm64 needs last argtype of ctypes._CFuncPtr (#2046)


Co-authored-by: Olli Lupton <oliver.lupton@epfl.ch>

* CheckGitDescribeCompatibility.cmake is PEP 440 compliant. (#3384)

* version macros test computes (major, minor, pat) from pep440 version

* An rxd/species.py string should be raw.

* See #3407 work around a problem sphinx has with itself.

* PEP440 regex too complicated for cmake 3.22.1 . Use Python

* Some ModelDB uses M_PI, struct timezone, and u_int32_t

* update changelog

---------

Co-authored-by: Olli Lupton <oliver.lupton@epfl.ch>
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.

3 participants