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

PERF: Additional performance updates #1209

Merged
merged 2 commits into from
Dec 21, 2022
+100 −70
Merged

PERF: Additional performance updates #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e4b35d
PERF: Avoid dictionary lookup in transform() calls
greglucas Dec 20, 2022
76f7c5f
PERF: Store internal PROJ error messages in Cython
greglucas Dec 20, 2022
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
80 changes: 42 additions & 38 deletions pyproj/_crs.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ import warnings
from collections import OrderedDict, namedtuple

from pyproj._compat cimport cstrdecode, cstrencode
from pyproj._datadir cimport pyproj_context_create, pyproj_context_destroy
from pyproj._datadir cimport (
_clear_proj_error,
pyproj_context_create,
pyproj_context_destroy,
)

from pyproj.aoi import AreaOfUse
from pyproj.crs.datum import CustomEllipsoid
Expand Down Expand Up @@ -113,7 +117,7 @@ cdef _to_wkt(
wkt_out_type,
options_wkt,
)
CRSError.clear()
_clear_proj_error()
return cstrdecode(proj_string)


Expand Down Expand Up @@ -161,7 +165,7 @@ cdef _to_proj4(
proj_out_type,
options,
)
CRSError.clear()
_clear_proj_error()
return cstrdecode(proj_string)


Expand All @@ -187,7 +191,7 @@ cdef tuple _get_concatenated_operations(
iii,
)
operations.append(CoordinateOperation.create(sub_context, operation))
CRSError.clear()
_clear_proj_error()
return tuple(operations)

cdef PJ * _from_name(
Expand Down Expand Up @@ -640,7 +644,7 @@ cdef class CoordinateSystem(_CRSParts):
"Invalid coordinate system string: "
f"{coordinate_system_string}"
)
CRSError.clear()
_clear_proj_error()
return CoordinateSystem.create(context, coordinate_system_pj)

@staticmethod
Expand Down Expand Up @@ -813,7 +817,7 @@ cdef class Ellipsoid(_CRSParts):
)
ellips.is_semi_minor_computed = is_semi_minor_computed == 1
ellips._set_base_info()
CRSError.clear()
_clear_proj_error()
return ellips

@staticmethod
Expand Down Expand Up @@ -847,7 +851,7 @@ cdef class Ellipsoid(_CRSParts):
if ellipsoid_pj == NULL:
pyproj_context_destroy(context)
raise CRSError(f"Invalid authority or code ({auth_name}, {code})")
CRSError.clear()
_clear_proj_error()
return Ellipsoid.create(context, ellipsoid_pj)

@staticmethod
Expand Down Expand Up @@ -899,7 +903,7 @@ cdef class Ellipsoid(_CRSParts):
raise CRSError(
f"Invalid ellipsoid string: {ellipsoid_string}"
)
CRSError.clear()
_clear_proj_error()
return Ellipsoid.create(context, ellipsoid_pj)

@staticmethod
Expand Down Expand Up @@ -1001,7 +1005,7 @@ cdef class Ellipsoid(_CRSParts):
if ellipsoid_pj == NULL:
pyproj_context_destroy(context)
raise CRSError(f"Invalid ellipsoid name: {ellipsoid_name}")
CRSError.clear()
_clear_proj_error()
return Ellipsoid.create(context, ellipsoid_pj)

@staticmethod
Expand Down Expand Up @@ -1091,7 +1095,7 @@ cdef class PrimeMeridian(_CRSParts):
)
prime_meridian.unit_name = decode_or_undefined(unit_name)
prime_meridian._set_base_info()
CRSError.clear()
_clear_proj_error()
return prime_meridian

@staticmethod
Expand Down Expand Up @@ -1125,7 +1129,7 @@ cdef class PrimeMeridian(_CRSParts):
if prime_meridian_pj == NULL:
pyproj_context_destroy(context)
raise CRSError(f"Invalid authority or code ({auth_name}, {code})")
CRSError.clear()
_clear_proj_error()
return PrimeMeridian.create(context, prime_meridian_pj)

@staticmethod
Expand Down Expand Up @@ -1180,7 +1184,7 @@ cdef class PrimeMeridian(_CRSParts):
raise CRSError(
f"Invalid prime meridian string: {prime_meridian_string}"
)
CRSError.clear()
_clear_proj_error()
return PrimeMeridian.create(context, prime_meridian_pj)

@staticmethod
Expand Down Expand Up @@ -1289,7 +1293,7 @@ cdef class PrimeMeridian(_CRSParts):
raise CRSError(
f"Invalid prime meridian name: {prime_meridian_name}"
)
CRSError.clear()
_clear_proj_error()
return PrimeMeridian.create(context, prime_meridian_pj)


Expand Down Expand Up @@ -1375,7 +1379,7 @@ cdef class Datum(_CRSParts):
if datum_pj == NULL:
pyproj_context_destroy(context)
raise CRSError(f"Invalid authority or code ({auth_name}, {code})")
CRSError.clear()
_clear_proj_error()
return Datum.create(context, datum_pj)

@staticmethod
Expand Down Expand Up @@ -1448,7 +1452,7 @@ cdef class Datum(_CRSParts):
proj_destroy(datum_pj)
pyproj_context_destroy(context)
raise CRSError(f"Invalid datum string: {datum_string}")
CRSError.clear()
_clear_proj_error()
return Datum.create(context, datum_pj)

@staticmethod
Expand Down Expand Up @@ -1517,7 +1521,7 @@ cdef class Datum(_CRSParts):
if datum_pj == NULL:
pyproj_context_destroy(context)
raise CRSError(f"Invalid datum name: {datum_name}")
CRSError.clear()
_clear_proj_error()
return Datum.create(context, datum_pj)

@staticmethod
Expand Down Expand Up @@ -1622,7 +1626,7 @@ cdef class Datum(_CRSParts):
context,
self.projobj,
)
CRSError.clear()
_clear_proj_error()
if ellipsoid_pj == NULL:
pyproj_context_destroy(context)
self._ellipsoid = False
Expand All @@ -1645,7 +1649,7 @@ cdef class Datum(_CRSParts):
context,
self.projobj,
)
CRSError.clear()
_clear_proj_error()
if prime_meridian_pj == NULL:
pyproj_context_destroy(context)
self._prime_meridian = False
Expand Down Expand Up @@ -1810,7 +1814,7 @@ cdef class Grid:
grid.direct_download = direct_download == 1
grid.open_license = open_license == 1
grid.available = available == 1
CRSError.clear()
_clear_proj_error()
return grid

def __str__(self):
Expand Down Expand Up @@ -1922,7 +1926,7 @@ cdef class CoordinateOperation(_CRSParts):
) == 1
cdef PJ_TYPE operation_type = proj_get_type(coord_operation.projobj)
coord_operation.type_name = _COORDINATE_OPERATION_TYPE_MAP[operation_type]
CRSError.clear()
_clear_proj_error()
return coord_operation

@staticmethod
Expand Down Expand Up @@ -1960,7 +1964,7 @@ cdef class CoordinateOperation(_CRSParts):
if coord_operation_pj == NULL:
pyproj_context_destroy(context)
raise CRSError(f"Invalid authority or code ({auth_name}, {code})")
CRSError.clear()
_clear_proj_error()
return CoordinateOperation.create(context, coord_operation_pj)

@staticmethod
Expand Down Expand Up @@ -2020,7 +2024,7 @@ cdef class CoordinateOperation(_CRSParts):
"Invalid coordinate operation string: "
f"{coordinate_operation_string}"
)
CRSError.clear()
_clear_proj_error()
return CoordinateOperation.create(context, coord_operation_pj)

@staticmethod
Expand Down Expand Up @@ -2135,7 +2139,7 @@ cdef class CoordinateOperation(_CRSParts):
"Invalid coordinate operation name: "
f"{coordinate_operation_name}"
)
CRSError.clear()
_clear_proj_error()
return CoordinateOperation.create(context, coordinate_operation_pj)

@property
Expand All @@ -2162,7 +2166,7 @@ cdef class CoordinateOperation(_CRSParts):
param_idx
)
)
CRSError.clear()
_clear_proj_error()
return self._params

@property
Expand All @@ -2189,7 +2193,7 @@ cdef class CoordinateOperation(_CRSParts):
grid_idx
)
)
CRSError.clear()
_clear_proj_error()
return self._grids

@property
Expand Down Expand Up @@ -2357,7 +2361,7 @@ cdef class _CRS(Base):
self.srs = proj_string
self._type = proj_get_type(self.projobj)
self._set_base_info()
CRSError.clear()
_clear_proj_error()

@property
def type_name(self):
Expand Down Expand Up @@ -2426,7 +2430,7 @@ cdef class _CRS(Base):
context,
self.projobj
)
CRSError.clear()
_clear_proj_error()
if ellipsoid_pj == NULL:
pyproj_context_destroy(context)
self._ellipsoid = False
Expand All @@ -2451,7 +2455,7 @@ cdef class _CRS(Base):
context,
self.projobj,
)
CRSError.clear()
_clear_proj_error()
if prime_meridian_pj == NULL:
pyproj_context_destroy(context)
self._prime_meridian = False
Expand Down Expand Up @@ -2480,7 +2484,7 @@ cdef class _CRS(Base):
context,
self.projobj,
)
CRSError.clear()
_clear_proj_error()
if datum_pj == NULL:
pyproj_context_destroy(context)
self._datum = False
Expand All @@ -2504,7 +2508,7 @@ cdef class _CRS(Base):
context,
self.projobj
)
CRSError.clear()
_clear_proj_error()
if coord_system_pj == NULL:
pyproj_context_destroy(context)
self._coordinate_system = False
Expand Down Expand Up @@ -2543,7 +2547,7 @@ cdef class _CRS(Base):
context,
self.projobj
)
CRSError.clear()
_clear_proj_error()
if coord_pj == NULL:
pyproj_context_destroy(context)
self._coordinate_operation = False
Expand All @@ -2565,7 +2569,7 @@ cdef class _CRS(Base):
if self._source_crs is not None:
return None if self._source_crs is False else self._source_crs
cdef PJ * projobj = proj_get_source_crs(self.context, self.projobj)
CRSError.clear()
_clear_proj_error()
if projobj == NULL:
self._source_crs = False
return None
Expand Down Expand Up @@ -2593,7 +2597,7 @@ cdef class _CRS(Base):
if self._target_crs is not None:
return None if self._target_crs is False else self._target_crs
cdef PJ * projobj = proj_get_target_crs(self.context, self.projobj)
CRSError.clear()
_clear_proj_error()
if projobj == NULL:
self._target_crs = False
return None
Expand Down Expand Up @@ -2646,7 +2650,7 @@ cdef class _CRS(Base):
self.projobj,
iii,
)
CRSError.clear()
_clear_proj_error()
return self._sub_crs_list

@property
Expand All @@ -2663,7 +2667,7 @@ cdef class _CRS(Base):
if self._geodetic_crs is not None:
return self._geodetic_crs if self. _geodetic_crs is not False else None
cdef PJ * projobj = proj_crs_get_geodetic_crs(self.context, self.projobj)
CRSError.clear()
_clear_proj_error()
if projobj == NULL:
self._geodetic_crs = False
return None
Expand Down Expand Up @@ -2861,7 +2865,7 @@ cdef class _CRS(Base):
finally:
if c_out_confidence_list != NULL:
proj_int_list_destroy(c_out_confidence_list)
CRSError.clear()
_clear_proj_error()

# retrieve the best matching projection
cdef PJ* proj = NULL
Expand Down Expand Up @@ -2891,7 +2895,7 @@ cdef class _CRS(Base):
# If there was none, calling it on NULL does nothing
proj_destroy(proj)
proj_list_destroy(proj_list)
CRSError.clear()
_clear_proj_error()
return authority_list

def to_3d(self, str name=None):
Expand Down Expand Up @@ -2923,7 +2927,7 @@ cdef class _CRS(Base):
cdef PJ * projobj = proj_crs_promote_to_3D(
self.context, c_name, self.projobj
)
CRSError.clear()
_clear_proj_error()
if projobj == NULL:
return self
try:
Expand Down
3 changes: 2 additions & 1 deletion pyproj/_datadir.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include "proj.pxi"


cpdef str _get_proj_error()
cpdef void _clear_proj_error()
cdef PJ_CONTEXT* PYPROJ_GLOBAL_CONTEXT
cdef PJ_CONTEXT* pyproj_context_create() except *
cdef void pyproj_context_destroy(PJ_CONTEXT* context) except *
2 changes: 2 additions & 0 deletions pyproj/_datadir.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ def _pyproj_global_context_initialize() -> None: ...
def get_user_data_dir(create: bool = False) -> str: ...
def _global_context_set_data_dir() -> None: ...
def set_use_global_context(active: Optional[bool] = None) -> None: ...
def _clear_proj_error() -> None: ...
def _get_proj_error() -> str: ...
Loading