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

Update 0.4.0 #64

Merged
merged 91 commits into from
Mar 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
e07997f
fix #62 by linking the runtime libraries for msvc
EmilDohne Mar 7, 2024
bfccaab
Fix #60 as well as disabling default build of benchmarks, docs and py…
EmilDohne Mar 7, 2024
cfba7db
Attempt fixing #61 by checking at compile time for AVX2 support and u…
EmilDohne Mar 7, 2024
a447cbe
Run CI on push to dev
EmilDohne Mar 7, 2024
14687d5
use macos-14 runners (beta) for CI as they dont require additional pa…
EmilDohne Mar 7, 2024
af0f3bf
drop -mavx2 compiler flag if its not required
EmilDohne Mar 7, 2024
3a881b3
Remove reference to "AVX2EndianByteSwap.h" where it wasnt necessary
EmilDohne Mar 7, 2024
cd5da3e
fix multiple redefinition error
EmilDohne Mar 7, 2024
6bc85ba
Move macro inside of PSAPI_NAMESPACE_BEGIN block
EmilDohne Mar 7, 2024
e60aeea
Silently disable AVX2
EmilDohne Mar 7, 2024
3878259
pass `-Wl,ld_classic` flags to fix arm based mac compilation
EmilDohne Mar 7, 2024
3a4a76c
change to -no-pie
EmilDohne Mar 7, 2024
4a23bc4
rework CI to programmatically set compiler
EmilDohne Mar 8, 2024
32cb6eb
Update CI to bump xcode version from broken 15.01 -> 15.1
EmilDohne Mar 8, 2024
3b29fd9
Add extra outputs to post-build steps
EmilDohne Mar 8, 2024
f9c42c3
Add more explicit echo and run copy command only on build
EmilDohne Mar 8, 2024
21e997d
Add debug step to cmake which lists all files
EmilDohne Mar 8, 2024
3a9d92c
Update backwards separated paths to be forwards slash separated
EmilDohne Mar 8, 2024
3804a04
Echo directory post-build
EmilDohne Mar 8, 2024
8af9290
Add temporary call to ls as post-build
EmilDohne Mar 8, 2024
f34e834
Make filepath preferred for initialization
EmilDohne Mar 8, 2024
ab9e655
actually assign make_preferred
EmilDohne Mar 8, 2024
9551b3f
add long path
EmilDohne Mar 8, 2024
9774567
Try alternative path concatenation
EmilDohne Mar 8, 2024
da19359
Make path forward slash in Compression as well
EmilDohne Mar 8, 2024
ecee45f
Update Test to once again run all sources
EmilDohne Mar 8, 2024
da1d623
Update endian implementation on failing tests
EmilDohne Mar 8, 2024
adb43f6
Change signature of byteswap slightly as well as adding return value
EmilDohne Mar 8, 2024
6f57054
Give more detailed error message on incompatible binary sizes
EmilDohne Mar 8, 2024
3f1fa2f
Raise abort after for doctest
EmilDohne Mar 8, 2024
444dd48
CTest extra verbose
EmilDohne Mar 8, 2024
48a9b75
Add status messages to tests
EmilDohne Mar 8, 2024
70ed23b
bump xcode to 15.2 to see if that stops exceptions from segfaulting
EmilDohne Mar 8, 2024
5e4ac44
Bump version down to XCode 14 and see if that resolves issues
EmilDohne Mar 8, 2024
e95fc61
Disable ARM mac testing due to XCode segfaulting on c++ exception
EmilDohne Mar 8, 2024
de02934
Re-enable testing of arm macs and define preprocessor macros which di…
EmilDohne Mar 8, 2024
42ffbe1
add missing semicolon
EmilDohne Mar 8, 2024
3633fca
Add further debug messages on test cases
EmilDohne Mar 8, 2024
c215343
Add check for missing folder
EmilDohne Mar 8, 2024
3a9e8a6
Create dir if it doesnt exist
EmilDohne Mar 8, 2024
f5a3b64
Add arm64 arch for macos build-wheels
EmilDohne Mar 8, 2024
cf381af
Disable build of examples in python wheels and add macos-14 runners f…
EmilDohne Mar 8, 2024
233fce9
Disable linking of vcredist (testing)
EmilDohne Mar 8, 2024
bf55411
Fix bug where we didnt actually enable python bindings in build again
EmilDohne Mar 8, 2024
b75effd
Add "tests" to the python wheels
EmilDohne Mar 8, 2024
d900157
Use project based paths for wheel testing
EmilDohne Mar 8, 2024
e804a2a
Use python instead of py
EmilDohne Mar 8, 2024
c633598
Add warning for try : except blocks using the PSAPI as they segfault …
EmilDohne Mar 8, 2024
63f072a
Add temp files to debug ubuntu based builds
EmilDohne Mar 8, 2024
49becbe
Remove tmp file and calls to sys path append
EmilDohne Mar 8, 2024
4b1fa50
Add ls command to before_test call
EmilDohne Mar 8, 2024
108c5c6
shuffle order to check if that makes a difference
EmilDohne Mar 8, 2024
e9187f4
check sys.modules to see if psapi is in it
EmilDohne Mar 8, 2024
9a9a4fc
Test NO_EXTRAS cmake setting
EmilDohne Mar 8, 2024
87a24e4
LS Dir
EmilDohne Mar 8, 2024
fa8114b
Try running interactive python session
EmilDohne Mar 8, 2024
0a756d0
Print out LayeredFile in interactive session
EmilDohne Mar 8, 2024
df34047
just import
EmilDohne Mar 8, 2024
7a2ac4d
add back exit condition to avoid locking
EmilDohne Mar 8, 2024
acebc47
call help() on psapi
EmilDohne Mar 8, 2024
5da42dd
Shuffle around numpy import
EmilDohne Mar 8, 2024
eb9c3d7
build up basic example step by step
EmilDohne Mar 8, 2024
5d41e93
add reference to psapi
EmilDohne Mar 8, 2024
4d2ab8a
Print out colormode
EmilDohne Mar 8, 2024
127897d
Generate file but dont write it out yet
EmilDohne Mar 8, 2024
5945c00
only create document, nothing else
EmilDohne Mar 8, 2024
479a0c9
add back numpy code
EmilDohne Mar 8, 2024
9e99c4f
Add back imagelayer definition
EmilDohne Mar 8, 2024
7d943a6
simply return image data without filling it
EmilDohne Mar 8, 2024
462182f
move return further down
EmilDohne Mar 8, 2024
020e23c
Update implementation to create an explicit vector from img data
EmilDohne Mar 8, 2024
9abad43
Fix losing of const qualifier
EmilDohne Mar 8, 2024
99f48c5
Swap channel id arrays
EmilDohne Mar 8, 2024
14a32a3
move return value back to original spot
EmilDohne Mar 8, 2024
d05613a
Simply create empty arrays
EmilDohne Mar 8, 2024
c67e5ba
Add debug logs
EmilDohne Mar 8, 2024
d20ab9f
Display size as well
EmilDohne Mar 8, 2024
f2863a2
Add even more debug logging
EmilDohne Mar 8, 2024
e6c033a
More debug logging
EmilDohne Mar 8, 2024
d2cb5f3
dont move image data into image layer
EmilDohne Mar 8, 2024
a5ab533
add some debug logging to imagelayer as well
EmilDohne Mar 8, 2024
d219a80
add nested debug logs to debug ubuntu failures
Mar 9, 2024
4204fbd
Generate a deeper stack trace for c-blosc compressions
Mar 9, 2024
53d9387
Generate temporary vec
Mar 9, 2024
eccf188
Add further identification and bump manylinux image
Mar 9, 2024
7d5ef58
Remove debug logs and build wheels
Mar 9, 2024
21904fa
Remove final debug logs and re-enable test cases
Mar 9, 2024
7acd438
Remove tmp file and bump requirement to 3.7 again to test all wheels
Mar 9, 2024
857ae0b
Lower numpy requirement to match python 3.7
Mar 9, 2024
3eb8822
Build macos arm wheels only on >=3.10
Mar 9, 2024
5811da0
update docs
Mar 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix losing of const qualifier
  • Loading branch information
EmilDohne committed Mar 8, 2024
commit 9abad438904a2f9901605f721cd49755df2de56e
12 changes: 6 additions & 6 deletions python/src/DeclareImageLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ std::unordered_map<Enum::ChannelID, std::vector<T>> generateImageData(py::array_
for (size_t i = 0; i < shape[0]; ++i)
{
std::vector<T> channelData(channelSize);
T* startPtr = image_data.data() + i * channelSize;
std::memcpy(reinterpret_cast<uint8_t*>(channelData.data()), reinterpret_cast<uint8_t*>(startPtr), channelSize * sizeof(T));
const T* startPtr = image_data.data() + i * channelSize;
std::memcpy(reinterpret_cast<uint8_t*>(channelData.data()), reinterpret_cast<const uint8_t*>(startPtr), channelSize * sizeof(T));

img_data_cpp[rgbChannelIDs[i]] = channelData;
}
Expand All @@ -78,8 +78,8 @@ std::unordered_map<Enum::ChannelID, std::vector<T>> generateImageData(py::array_
for (size_t i = 0; i < shape[0]; ++i)
{
std::vector<T> channelData(channelSize);
T* startPtr = image_data.data() + i * channelSize;
std::memcpy(reinterpret_cast<uint8_t*>(channelData.data()), reinterpret_cast<uint8_t*>(startPtr), channelSize * sizeof(T));
const T* startPtr = image_data.data() + i * channelSize;
std::memcpy(reinterpret_cast<uint8_t*>(channelData.data()), reinterpret_cast<const uint8_t*>(startPtr), channelSize * sizeof(T));

img_data_cpp[rgbChannelIDs[i]] = channelData;
}
Expand All @@ -97,8 +97,8 @@ std::unordered_map<Enum::ChannelID, std::vector<T>> generateImageData(py::array_
for (size_t i = 0; i < shape[0]; ++i)
{
std::vector<T> channelData(channelSize);
T* startPtr = image_data.data() + i * channelSize;
std::memcpy(reinterpret_cast<uint8_t*>(channelData.data()), reinterpret_cast<uint8_t*>(startPtr), channelSize * sizeof(T));
const T* startPtr = image_data.data() + i * channelSize;
std::memcpy(reinterpret_cast<uint8_t*>(channelData.data()), reinterpret_cast<const uint8_t*>(startPtr), channelSize * sizeof(T));

img_data_cpp[rgbChannelIDs[i]] = channelData;
}
Expand Down
Loading