Skip to content

Commit

Permalink
split ewah bool array code
Browse files Browse the repository at this point in the history
  • Loading branch information
themousepotato committed Jul 1, 2020
1 parent 6befef2 commit 0a27672
Show file tree
Hide file tree
Showing 13 changed files with 8 additions and 5,798 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ yt/utilities/lib/cyoctree.cpp
yt/utilities/lib/depth_first_octree.c
yt/utilities/lib/distance_queue.c
yt/utilities/lib/element_mappings.c
yt/utilities/lib/ewah_bool_wrap.cpp
yt/utilities/lib/fnv_hash.c
yt/utilities/lib/fortran_reader.c
yt/utilities/lib/freetype_writer.c
Expand Down
1 change: 0 additions & 1 deletion .hgignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ yt/utilities/lib/contour_finding.c
yt/utilities/lib/depth_first_octree.c
yt/utilities/lib/distance_queue.c
yt/utilities/lib/element_mappings.c
yt/utilities/lib/ewah_bool_wrap.cpp
yt/utilities/lib/fnv_hash.c
yt/utilities/lib/fortran_reader.c
yt/utilities/lib/freetype_writer.c
Expand Down
8 changes: 1 addition & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ def _compile(
libraries=std_libs),
Extension("yt.geometry.particle_oct_container",
["yt/geometry/particle_oct_container.pyx"],
include_dirs=["yt/utilities/lib/",
"yt/utilities/lib/ewahboolarray"],
include_dirs=["yt/utilities/lib/"],
language="c++",
libraries=std_libs,
extra_compile_args=["-std=c++11"]),
Expand Down Expand Up @@ -226,11 +225,6 @@ def _compile(
include_dirs=["yt/utilities/lib/"],
libraries=std_libs,
depends=["yt/utilities/lib/fixed_interpolator.h"]),
Extension("yt.utilities.lib.ewah_bool_wrap",
["yt/utilities/lib/ewah_bool_wrap.pyx"],
include_dirs=["yt/utilities/lib/",
"yt/utilities/lib/ewahboolarray"],
language="c++", extra_compile_args=["-std=c++11"]),
Extension("yt.utilities.lib.image_samplers",
["yt/utilities/lib/image_samplers.pyx",
"yt/utilities/lib/fixed_interpolator.c"],
Expand Down
14 changes: 7 additions & 7 deletions yt/geometry/particle_oct_container.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ from libc.string cimport memset
from libc.math cimport floor, ceil, fmod
from libcpp.map cimport map
from libcpp.vector cimport vector
from yt.utilities.lib.ewah_bool_array cimport \
from ewah_bool_utils.ewah_bool_array cimport \
ewah_bool_array, ewah_bool_iterator, ewah_map, bool_array, ewah_word_type
import numpy as np
cimport numpy as np
Expand All @@ -36,8 +36,8 @@ from collections import defaultdict
from yt.funcs import get_pbar

from particle_deposit cimport gind
#from yt.utilities.lib.ewah_bool_wrap cimport \
from ..utilities.lib.ewah_bool_wrap cimport BoolArrayCollection
#from ewah_bool_utils.ewah_bool_wrap cimport \
from ewah_bool_utils.ewah_bool_wrap cimport BoolArrayCollection
import struct
import os

Expand All @@ -49,10 +49,10 @@ DEF RefinedExternalGhosts = 1

_bitmask_version = np.uint64(5)

from ..utilities.lib.ewah_bool_wrap cimport SparseUnorderedBitmaskSet as SparseUnorderedBitmask
from ..utilities.lib.ewah_bool_wrap cimport SparseUnorderedRefinedBitmaskSet as SparseUnorderedRefinedBitmask
from ..utilities.lib.ewah_bool_wrap cimport BoolArrayCollectionUncompressed as BoolArrayColl
from ..utilities.lib.ewah_bool_wrap cimport FileBitmasks
from ewah_bool_utils.ewah_bool_wrap cimport SparseUnorderedBitmaskSet as SparseUnorderedBitmask
from ewah_bool_utils.ewah_bool_wrap cimport SparseUnorderedRefinedBitmaskSet as SparseUnorderedRefinedBitmask
from ewah_bool_utils.ewah_bool_wrap cimport BoolArrayCollectionUncompressed as BoolArrayColl
from ewah_bool_utils.ewah_bool_wrap cimport FileBitmasks

ctypedef map[np.uint64_t, bool_array] CoarseRefinedSets

Expand Down
102 changes: 0 additions & 102 deletions yt/utilities/lib/ewah_bool_array.pxd

This file was deleted.

159 changes: 0 additions & 159 deletions yt/utilities/lib/ewah_bool_wrap.pxd

This file was deleted.

Loading

0 comments on commit 0a27672

Please sign in to comment.