pub_soft/rdkit
3
0
Fork 0
mirror of https://github.com/rdkit/rdkit.git synced 2026-06-05 22:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

switch to popcntl

Browse Source
This commit is contained in:
Greg Landrum
2016-01-19 01:54:21 -05:00
parent 55c96db67e
commit 2c4964eed3
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Code/DataStructs/BitOps.cpp
View File

@@ -785,6 +785,7 @@ template void UpdateBitVectFromBinaryText(ExplicitBitVect&, const std::string&);
#ifdef _MSC_VER
#include <intrin.h>
#define __builtin_popcount __popcnt
#define __builtin_popcountl __popcnt64
#endif
#define USE_BUILTIN_POPCOUNT 1
@@ -834,14 +835,14 @@ double CalcBitmapTanimoto(const unsigned char* afp, const unsigned char* bfp,
intersect_popcount += byte_popcounts[afp[i] & bfp[i]];
}
#else
unsigned int eidx = nBytes / sizeof(unsigned int);
for (unsigned int i = 0; i < eidx; ++i) {
union_popcount +=
__builtin_popcount(((unsigned int*)afp)[i] | ((unsigned int*)bfp)[i]);
intersect_popcount +=
__builtin_popcount(((unsigned int*)afp)[i] & ((unsigned int*)bfp)[i]);
boost::uint64_t eidx = nBytes / sizeof(boost::uint64_t);
for (boost::uint64_t i = 0; i < eidx; ++i) {
union_popcount += __builtin_popcountl(((boost::uint64_t*)afp)[i] |
((boost::uint64_t*)bfp)[i]);
intersect_popcount += __builtin_popcountl(((boost::uint64_t*)afp)[i] &
((boost::uint64_t*)bfp)[i]);
}
for (unsigned int i = eidx * sizeof(unsigned int); i < nBytes; ++i) {
for (boost::uint64_t i = eidx * sizeof(boost::uint64_t); i < nBytes; ++i) {
union_popcount += byte_popcounts[afp[i] | bfp[i]];
intersect_popcount += byte_popcounts[afp[i] & bfp[i]];
}