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

Fix type for Windows OS #80

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix type for Windows OS #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 24 additions & 5 deletions pyci/include/pyci.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,15 @@ inline int Ctz(const unsigned long long t) {
}

/* Hash function. */

typedef std::pair<ulong, ulong> Hash;
typedef std::pair<uint64_t, uint64_t> Hash;

template<typename T, typename U>
Hash spookyhash(T length, const U *data) {
Hash h(0x23a23cf5033c3c81UL, 0xb3816f6a2c68e530UL);
SpookyHash::Hash128(reinterpret_cast<const void *>(data), length * sizeof(U), &h.first, &h.second);
return h;
Hash h(0x23a23cf5033c3c81ULL, 0xb3816f6a2c68e530ULL); // Use ULL suffix for unsigned long long
uint64_t first = h.first;
uint64_t second = h.second;
SpookyHash::Hash128(reinterpret_cast<const void *>(data), length * sizeof(U), &first, &second);
return Hash(first, second);
}

/* Vector template types. */
Expand All @@ -135,6 +136,24 @@ using Vector = std::vector<T>;
template<typename T>
using AlignedVector = std::vector<T, Eigen::aligned_allocator<T>>;

}
// typedef std::pair<ulong, ulong> Hash;

// template<typename T, typename U>
// Hash spookyhash(T length, const U *data) {
// Hash h(0x23a23cf5033c3c81UL, 0xb3816f6a2c68e530UL);
// SpookyHash::Hash128(reinterpret_cast<const void *>(data), length * sizeof(U), &h.first, &h.second);
// return h;
// }

// /* Vector template types. */

// template<typename T>
// using Vector = std::vector<T>;

// template<typename T>
// using AlignedVector = std::vector<T, Eigen::aligned_allocator<T>>;

/* Eigen dense matrix template types. */

#define PYCI_MAT_DYNAMIC Eigen::Dynamic, Eigen::Dynamic
Expand Down
Loading