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.

Sign up for GitHub

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

Jump to bottom

[WIP] Cython spiceypy prototype #464

Open
wants to merge 87 commits into
base: main
Choose a base branch
from
Open

[WIP] Cython spiceypy prototype #464

wants to merge 87 commits into from

Commits on Jan 3, 2023

  1. start of cyice

    @AndrewAnnex
    AndrewAnnex committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    dba47f2 View commit details
    Browse the repository at this point in the history

  2. start but a lot of moving pieces, get the build and tests done next

    @AndrewAnnex
    AndrewAnnex committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    d3f3328 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. Working out build system 

    I think I may need to transistion to having two pyproject.tomls for
spiceypy and cyice which would require some changes to the layout and
possibly duplication of get_cspice.py (or make that a third project that
all others depend on).
    @AndrewAnnex
    AndrewAnnex committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    a2a89a9 View commit details
    Browse the repository at this point in the history

  2. some things working again

    @AndrewAnnex
    AndrewAnnex committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    31d7df0 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2023

  1. okay think this is building finally

    @AndrewAnnex
    AndrewAnnex committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    df83f2e View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2023

  1. kinda working b1900, cyice so needs to be in correct folder

    @AndrewAnnex
    AndrewAnnex committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    682d2c2 View commit details
    Browse the repository at this point in the history

  2. added cells and a functions to extern, no wrappers yet

    @AndrewAnnex
    AndrewAnnex committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    b1b9862 View commit details
    Browse the repository at this point in the history

  3. working but slow string example

    @AndrewAnnex
    AndrewAnnex committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    9d2344f View commit details
    Browse the repository at this point in the history

  4. simpler but still kinda slow string support using compiler directives

    @AndrewAnnex
    AndrewAnnex committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    4bb92d3 View commit details
    Browse the repository at this point in the history

  5. sort-of working spkezr, but now that I showed that the kernel pool is… 

    … shared I can focus on vectorized functions
    @AndrewAnnex
    AndrewAnnex committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    66bba9e View commit details
    Browse the repository at this point in the history

  6. working vectorized spkezr, is about twice as fast as pure python

    @AndrewAnnex
    AndrewAnnex committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    4c38f64 View commit details
    Browse the repository at this point in the history

  7. working tests

    @AndrewAnnex
    AndrewAnnex committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    403e31b View commit details
    Browse the repository at this point in the history

  8. added spkpos

    @AndrewAnnex
    AndrewAnnex committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    e3f1b29 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2023

  1. working through issues surrounding strings, str2et and et2utc are goo… 

    …d examples of list of strings as inputs and outputs
    @AndrewAnnex
    AndrewAnnex committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    bf15c60 View commit details
    Browse the repository at this point in the history

  2. working et2utc using python list to return, about 2x speed

    @AndrewAnnex
    AndrewAnnex committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    bfb2d5c View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. all working but a number of todos

    @AndrewAnnex
    AndrewAnnex committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    5013abc View commit details
    Browse the repository at this point in the history

  2. loop unrolling

    @AndrewAnnex
    AndrewAnnex committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    399600a View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2023

  1. change to use _v convention for naming

    @AndrewAnnex
    AndrewAnnex committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    7a0f804 View commit details
    Browse the repository at this point in the history

  2. some cleanup

    @AndrewAnnex
    AndrewAnnex committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    a50676f View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. idx testing another et2utc

    @AndrewAnnex
    AndrewAnnex committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    89bfe32 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2023

  1. updated version and added cython as dependency

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    8a1ee5d View commit details
    Browse the repository at this point in the history

  2. more small changes to the tests and added pytest-benchmark, but will … 

    …have to think about how to have good usage of it
    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    592fe4c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into cyice

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    e251ae0 View commit details
    Browse the repository at this point in the history

  4. remove codecov

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    25e3948 View commit details
    Browse the repository at this point in the history

  5. invalidate cache

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    161828d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into cyice

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    3b59c8d View commit details
    Browse the repository at this point in the history

  7. fix for ci build

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    b2d2334 View commit details
    Browse the repository at this point in the history

  8. fix for ci build, forgot numpy and cython

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    2bb46c3 View commit details
    Browse the repository at this point in the history

  9. fix for ci build, use ci-req

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    28e73f7 View commit details
    Browse the repository at this point in the history

  10. may need to refactor get_spice to use argparse

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    a85ba1c View commit details
    Browse the repository at this point in the history

  11. removed c math library for now

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    05e16e2 View commit details
    Browse the repository at this point in the history

  12. trying again

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    02d954f View commit details
    Browse the repository at this point in the history

  13. forgot a flag

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    aa026d5 View commit details
    Browse the repository at this point in the history

  14. cross platform fix

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    ecf1847 View commit details
    Browse the repository at this point in the history

  15. silly windows fix that shouldn't work:

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    dbcc3fc View commit details
    Browse the repository at this point in the history

  16. silly windows fix that shouldn't work and cache invalidate

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    288267d View commit details
    Browse the repository at this point in the history

  17. silly windows fix that shouldn't work and cache invalidate

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    7af0187 View commit details
    Browse the repository at this point in the history

  18. added copying libcspice.lib file to get_spiceypy.py for cython, updat… 

    …ed makeDynamicSpice script to list out directory contnets
    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    55703bd View commit details
    Browse the repository at this point in the history

  19. expand cache key to avoid rebuild issues more"

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    174667f View commit details
    Browse the repository at this point in the history

  20. trying to use lib command 1

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    9033f3f View commit details
    Browse the repository at this point in the history

  21. trying to use lib command 2

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    2fe6250 View commit details
    Browse the repository at this point in the history

  22. trying to use lib command 3

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    59bbd05 View commit details
    Browse the repository at this point in the history

  23. trying to use lib command 4

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    876c39e View commit details
    Browse the repository at this point in the history

  24. uggh cython breaks the build cache I have, attempting to move what's … 

    …needed so each job builds but may need to disable the cache restoration
    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    2c6c45a View commit details
    Browse the repository at this point in the history

  25. fix issue with ci yaml

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    793f38a View commit details
    Browse the repository at this point in the history

  26. fix issue with ci yaml

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    03b1274 View commit details
    Browse the repository at this point in the history

  27. fix issue with ci yaml

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    37f00dd View commit details
    Browse the repository at this point in the history

  28. cache step failing now weirdly

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    1098402 View commit details
    Browse the repository at this point in the history

  29. had the checkout step in the wrong spot for cache check

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    5bd20a4 View commit details
    Browse the repository at this point in the history

  30. more cache mistakes

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    90da86e View commit details
    Browse the repository at this point in the history

  31. more cache mistakes

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    e886820 View commit details
    Browse the repository at this point in the history

  32. remove cache for now

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    19b1031 View commit details
    Browse the repository at this point in the history

  33. weird new pyproject.toml parse issue

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    76ce080 View commit details
    Browse the repository at this point in the history

  34. missed pytest-benchmark even though I remember adding it

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    b6d3dda View commit details
    Browse the repository at this point in the history

  35. missing dll on windows side after succesful build

    @AndrewAnnex
    AndrewAnnex committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    3df40cb View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. wheel tags no longer can be python version independent, not sure why … 

    …pyd not being found for windows
    @AndrewAnnex
    AndrewAnnex committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    b96e21b View commit details
    Browse the repository at this point in the history

Commits on May 4, 2023

  1. incorporating feedback, added additional functions and non-vectorized… 

    … wrappers for future use, additional benchmark tests
    @AndrewAnnex
    AndrewAnnex committed May 4, 2023
    Configuration menu
    Copy the full SHA
    ba1d78d View commit details
    Browse the repository at this point in the history

  2. tweaking the ci parts to build the shared library again and cache it … 

    …with the cspice src dir so that jobs don't have to download cspice src/compile the cspice lib
    @AndrewAnnex
    AndrewAnnex committed May 4, 2023
    Configuration menu
    Copy the full SHA
    ee96f36 View commit details
    Browse the repository at this point in the history

  3. attempting to install from wheels instead for windows, but clearly so… 

    …me badness happening with get_spice/setup.py/pyproject.toml
    @AndrewAnnex
    AndrewAnnex committed May 4, 2023
    Configuration menu
    Copy the full SHA
    e092ea4 View commit details
    Browse the repository at this point in the history

  4. simplify cache key

    @AndrewAnnex
    AndrewAnnex committed May 4, 2023
    Configuration menu
    Copy the full SHA
    7ccf114 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. possible fix for offline cspice install

    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    98e9e92 View commit details
    Browse the repository at this point in the history

  2. need to check copytree to overwrite

    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    8a9197a View commit details
    Browse the repository at this point in the history

  3. typos

    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    0ca5688 View commit details
    Browse the repository at this point in the history

  4. typos

    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    be19a43 View commit details
    Browse the repository at this point in the history

  5. fix for windows

    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    aac0fc2 View commit details
    Browse the repository at this point in the history

  6. fix for windows and smaller cache hopefully

    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    c5e99c6 View commit details
    Browse the repository at this point in the history

  7. more verboseness and fixes for temporary files when cspice dir is src… 

    …/cspice
    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    c4e9365 View commit details
    Browse the repository at this point in the history

  8. so if the cache is found, the artifact is not found by the subsequent… 

    … job
    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    357b698 View commit details
    Browse the repository at this point in the history

  9. fixed bug where build wasn't happening

    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    6898f86 View commit details
    Browse the repository at this point in the history

  10. simpler check

    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    b6494ff View commit details
    Browse the repository at this point in the history

  11. add macos whl fix, had pip install change in wrong spot for windows

    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    6a5939d View commit details
    Browse the repository at this point in the history

  12. going to older method, but think by enabling alphas the prior way wou… 

    …ld work
    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    6cb1d97 View commit details
    Browse the repository at this point in the history

  13. possible fix for windows build relative import of cyice, really not s… 

    …ure why thats an issue at all though so maybe wheel isn't properly packaging the pyd file
    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    a4a258f View commit details
    Browse the repository at this point in the history

  14. not sure what's up with windows, think I got a fix for offline shared… 

    … installation
    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    39207b8 View commit details
    Browse the repository at this point in the history

  15. fogot SLP needs to be a list

    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    ad8396f View commit details
    Browse the repository at this point in the history

  16. okay maybe the lib file is needed for windows? or else I need to edit… 

    … the python lib path... idk
    @AndrewAnnex
    AndrewAnnex committed May 5, 2023
    Configuration menu
    Copy the full SHA
    567bb9b View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. discovered cython on windows is very sensitive to the actual library … 

    …name (both file and internal name). Updating to libcspice internally for windows
    @AndrewAnnex
    AndrewAnnex committed May 8, 2023
    Configuration menu
    Copy the full SHA
    ddf587c View commit details
    Browse the repository at this point in the history

  2. needed to recache

    @AndrewAnnex
    AndrewAnnex committed May 8, 2023
    Configuration menu
    Copy the full SHA
    528617c View commit details
    Browse the repository at this point in the history

  3. added etcal and sxform

    @AndrewAnnex
    AndrewAnnex committed May 8, 2023
    Configuration menu
    Copy the full SHA
    7dfaa5a View commit details
    Browse the repository at this point in the history

Commits on May 13, 2023

  1. added convrt and some functions for the error checking system

    @AndrewAnnex
    AndrewAnnex committed May 13, 2023
    Configuration menu
    Copy the full SHA
    866fb18 View commit details
    Browse the repository at this point in the history

  2. trying to improve the setup situation for cibuildwheel and sdist inst… 

    …all, need to work out a way to have a temp dir that's consistent between running get_spice and defining the cython extension
    @AndrewAnnex
    AndrewAnnex committed May 13, 2023
    Configuration menu
    Copy the full SHA
    2277980 View commit details
    Browse the repository at this point in the history

  3. forgot a thing

    @AndrewAnnex
    AndrewAnnex committed May 13, 2023
    Configuration menu
    Copy the full SHA
    84210c8 View commit details
    Browse the repository at this point in the history

  4. fix for test, but missing numpy in cibuildwheel despite build-system … 

    …requires
    @AndrewAnnex
    AndrewAnnex committed May 13, 2023
    Configuration menu
    Copy the full SHA
    b9b0116 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2023

  1. fix for test again, changes for better numpy support in cibuildwheels

    @AndrewAnnex
    AndrewAnnex committed May 14, 2023
    Configuration menu
    Copy the full SHA
    660d22c View commit details
    Browse the repository at this point in the history

  2. cibuildwheels is ignoring my build-system requires list?

    @AndrewAnnex
    AndrewAnnex committed May 14, 2023
    Configuration menu
    Copy the full SHA
    6206f68 View commit details
    Browse the repository at this point in the history

  3. cibuildwheel repair failing as library path was not set, but I alread… 

    …y include the so files
    @AndrewAnnex
    AndrewAnnex committed May 14, 2023
    Configuration menu
    Copy the full SHA
    a5fa1b3 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. disabling repair command for now

    @AndrewAnnex
    AndrewAnnex committed May 15, 2023
    Configuration menu
    Copy the full SHA
    e62a539 View commit details
    Browse the repository at this point in the history