Skip to content

rename to_array to avoid std conflict #58

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

Merged
ChaitanyaChawak merged 2 commits into from
Apr 10, 2025
Merged

rename to_array to avoid std conflict #58

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
6a6aff5
rename to_array to avoid std conflict
sfarrens Apr 9, 2025
7e79547
update constructor definition
sfarrens Apr 10, 2025
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ endif()
# ------------------ #

# Set CXX options
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

Expand Down
7 changes: 3 additions & 4 deletions cmake/FetchPybind11.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# -------------- #

# Set Pybind11 Version
set(Pybind11Version 2.10.3)
set(Pybind11SHA256 5d8c4c5dda428d3a944ba3d2a5212cb988c2fae4670d58075a5a49075a6ca315)
set(Pybind11Version 2.13.6)
set(Pybind11SHA256 e08cb87f4773da97fa7b5f035de8763abc656d87d5773e62f6da0587d1f0ec20)

# Set Pybdin11 fetch location
FetchContent_Declare(
Expand All @@ -16,6 +16,5 @@ FetchContent_Declare(
# Fetch and source Pybind11
FetchContent_GetProperties(pybind11)
if(NOT pybind11_POPULATED)
FetchContent_Populate(pybind11)
add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR})
FetchContent_MakeAvailable(pybind11)
endif()
8 changes: 4 additions & 4 deletions src/astro_wl/libwl/shearinversions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ void ShearInversions::kappa2gamma(double* pt_kappa, double* pt_gamma1, double* p

}

void ShearInversions::kappa2gamma(to_array< double, true >& kappa, to_array< double, true >& gamma1, to_array< double, true >& gamma2)
void ShearInversions::kappa2gamma(convert_to_array< double, true >& kappa, convert_to_array< double, true >& gamma1, convert_to_array< double, true >& gamma2)
{
double *pt_gamma1 = gamma1.buffer();
double *pt_gamma2 = gamma2.buffer();
Expand All @@ -210,7 +210,7 @@ void ShearInversions::kappa2gamma(to_array< double, true >& kappa, to_array< dou
kappa2gamma(pt_kappa,pt_gamma1,pt_gamma2,Nx,Ny,Nz+1);
}

void ShearInversions::kappa2flexion(double pixel_size, to_array< double, true >& kappa, to_array< double, true >& F1, to_array< double, true >& F2)
void ShearInversions::kappa2flexion(double pixel_size, convert_to_array< double, true >& kappa, convert_to_array< double, true >& F1, convert_to_array< double, true >& F2)
{
double *pt_F1 = F1.buffer();
double *pt_F2 = F2.buffer();
Expand Down Expand Up @@ -280,7 +280,7 @@ void ShearInversions::kappa2flexion(double pixel_size, double* pt_kappa, double*
}


void ShearInversions::flexion2kappa(double pixel_size,to_array< double, true >& F1, to_array< double, true >& F2, to_array< double, true >& kappa)
void ShearInversions::flexion2kappa(double pixel_size,convert_to_array< double, true >& F1, convert_to_array< double, true >& F2, convert_to_array< double, true >& kappa)
{
double *pt_F1 = F1.buffer();
double *pt_F2 = F2.buffer();
Expand Down Expand Up @@ -342,7 +342,7 @@ void ShearInversions::flexion2kappa(double pixel_size, double* pt_F1, double* pt

}

void ShearInversions::gamma_flexion2kappa(double pixel_size, to_array< double, true >& gamma1, to_array< double, true >& gamma2, to_array< double, true >& F1, to_array< double, true >& F2, to_array< double, true >& kappa)
void ShearInversions::gamma_flexion2kappa(double pixel_size, convert_to_array< double, true >& gamma1, convert_to_array< double, true >& gamma2, convert_to_array< double, true >& F1, convert_to_array< double, true >& F2, convert_to_array< double, true >& kappa)
{
double *pt_gamma1 = gamma1.buffer();
double *pt_gamma2 = gamma2.buffer();
Expand Down
424 changes: 212 additions & 212 deletions src/mr/libmr2d/Wavelet_wmir.h
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/mrs/libmrs/mrs_planck_lGMCA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ class lGMCA_inv {

C_UWT2D_ATROUS WT_Trans; //will contain the wavelet transform routines for the Nchannels

to_array<unsigned long,true> FaceIndices;//Index of each pixel in a face in Healpix Ring format
to_array<unsigned long,true> Nest2Ring_indices;//Index of each pixel in a face in Healpix Ring format
to_array<unsigned long,true> Ring2Nest_indices;//Index of each pixel in a face in Healpix Ring format
convert_to_array<unsigned long,true> FaceIndices;//Index of each pixel in a face in Healpix Ring format
convert_to_array<unsigned long,true> Nest2Ring_indices;//Index of each pixel in a face in Healpix Ring format
convert_to_array<unsigned long,true> Ring2Nest_indices;//Index of each pixel in a face in Healpix Ring format

bool Verbose;
bool Debug;
Expand Down
56 changes: 28 additions & 28 deletions src/msvst/libmsvst/Fisz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,27 @@ class FiszTransform
// dimension of the nearest power of two,
// if the data size is not of power two;
// ext is an array of 6 elements (extension information of 6 directions)
void dataExtension (to_array<DATATYPE, true> &data, int ext[], type_border BORDERTYPE=I_MIRROR);
void dataExtension (convert_to_array<DATATYPE, true> &data, int ext[], type_border BORDERTYPE=I_MIRROR);
// extract the original data in using the extension information
void dataExtraction (to_array<DATATYPE, true> &data, int ext[]);
void dataExtraction (convert_to_array<DATATYPE, true> &data, int ext[]);

// Fisz transform 1D / 2D / 3D
// the data size MUST be power of two,
// otherwise, a DataSizeException will be thrown out
void fisz1D (to_array<DATATYPE, true> &data);
void fisz2D (to_array<DATATYPE, true> &data);
void fisz3D (to_array<DATATYPE, true> &data);
void fisz1D (convert_to_array<DATATYPE, true> &data);
void fisz2D (convert_to_array<DATATYPE, true> &data);
void fisz3D (convert_to_array<DATATYPE, true> &data);

// Inverse Fisz transform 1D / 2D / 3D
// data size MUST be power of two.
// otherwise, a DataSizeException will be thrown out
void ifisz1D (to_array<DATATYPE, true> &data);
void ifisz2D (to_array<DATATYPE, true> &data);
void ifisz3D (to_array<DATATYPE, true> &data);
void ifisz1D (convert_to_array<DATATYPE, true> &data);
void ifisz2D (convert_to_array<DATATYPE, true> &data);
void ifisz3D (convert_to_array<DATATYPE, true> &data);
};

template <class DATATYPE>
void FiszTransform<DATATYPE>::dataExtension (to_array<DATATYPE, true> &data, int ext[], type_border BORDERTYPE)
void FiszTransform<DATATYPE>::dataExtension (convert_to_array<DATATYPE, true> &data, int ext[], type_border BORDERTYPE)
{
int lext = 0, rext = 0, uext = 0, dext = 0, bext = 0, fext = 0;
int dim = data.naxis();
Expand All @@ -54,7 +54,7 @@ void FiszTransform<DATATYPE>::dataExtension (to_array<DATATYPE, true> &data, int
lext = (newlen - len1) / 2;
rext = (newlen - len1) - lext;

to_array<DATATYPE, true> *temp = new to_array<DATATYPE, true>(newlen);
convert_to_array<DATATYPE, true> *temp = new convert_to_array<DATATYPE, true>(newlen);
for (int x=0; x<newlen; x++)
(*temp)(x) = data(x-lext, BORDERTYPE);
data = *temp;
Expand All @@ -72,7 +72,7 @@ void FiszTransform<DATATYPE>::dataExtension (to_array<DATATYPE, true> &data, int
lext = (newlen1 - len1) / 2; rext = (newlen1 - len1) - lext;
uext = (newlen2 - len2) / 2; dext = (newlen2 - len2) - uext;

to_array<DATATYPE, true> *temp = new to_array<DATATYPE, true>(newlen1, newlen2);
convert_to_array<DATATYPE, true> *temp = new convert_to_array<DATATYPE, true>(newlen1, newlen2);
for (int y=0; y<newlen2; y++)
for (int x=0; x<newlen1; x++)
(*temp)(x, y) = data(x-lext, y-uext, BORDERTYPE);
Expand All @@ -92,7 +92,7 @@ void FiszTransform<DATATYPE>::dataExtension (to_array<DATATYPE, true> &data, int
uext = (newlen2 - len2) / 2; dext = (newlen2 - len2) - uext;
bext = (newlen3 - len3) / 2; fext = (newlen3 - len3) - fext;

to_array<DATATYPE, true> *temp = new to_array<DATATYPE, true>(newlen1, newlen2, newlen3);
convert_to_array<DATATYPE, true> *temp = new convert_to_array<DATATYPE, true>(newlen1, newlen2, newlen3);
for (int z=0; z<newlen3; z++)
for (int y=0; y<newlen2; y++)
for (int x=0; x<newlen1; x++)
Expand All @@ -106,7 +106,7 @@ void FiszTransform<DATATYPE>::dataExtension (to_array<DATATYPE, true> &data, int
}

template<class DATATYPE>
void FiszTransform<DATATYPE>::dataExtraction (to_array<DATATYPE, true> &data, int ext[])
void FiszTransform<DATATYPE>::dataExtraction (convert_to_array<DATATYPE, true> &data, int ext[])
{
int dim = data.naxis();
int lext = ext[0], rext = ext[1], uext = ext[2];
Expand All @@ -115,7 +115,7 @@ void FiszTransform<DATATYPE>::dataExtraction (to_array<DATATYPE, true> &data, in
if ((dim == 1) && ((lext != 0) || (rext != 0)))
{
int finallen = data.nx() - lext - rext;
to_array<DATATYPE,true> *tdata = new to_array<DATATYPE, true>(finallen);
convert_to_array<DATATYPE,true> *tdata = new convert_to_array<DATATYPE, true>(finallen);
for (int x=0; x<finallen; x++) (*tdata)(x) = data(lext+x);
data = (*tdata);
if (tdata != NULL) { delete tdata; tdata = NULL; }
Expand All @@ -125,7 +125,7 @@ void FiszTransform<DATATYPE>::dataExtraction (to_array<DATATYPE, true> &data, in
{
int finallen1 = data.nx() - lext - rext;
int finallen2 = data.ny() - uext - dext;
to_array<DATATYPE,true> *tdata = new to_array<DATATYPE, true>(finallen1, finallen2);
convert_to_array<DATATYPE,true> *tdata = new convert_to_array<DATATYPE, true>(finallen1, finallen2);
for (int x=0; x<finallen1; x++)
for (int y=0; y<finallen2; y++)
(*tdata)(x, y) = data(lext+x, uext+y);
Expand All @@ -139,7 +139,7 @@ void FiszTransform<DATATYPE>::dataExtraction (to_array<DATATYPE, true> &data, in
int finallen1 = data.nx() - lext - rext;
int finallen2 = data.ny() - uext - dext;
int finallen3 = data.nz() - bext - fext;
to_array<DATATYPE,true> *tdata = new to_array<DATATYPE, true>(finallen1, finallen2, finallen3);
convert_to_array<DATATYPE,true> *tdata = new convert_to_array<DATATYPE, true>(finallen1, finallen2, finallen3);
for (int x=0; x<finallen1; x++)
for (int y=0; y<finallen2; y++)
for (int z=0; z<finallen3; z++)
Expand All @@ -150,14 +150,14 @@ void FiszTransform<DATATYPE>::dataExtraction (to_array<DATATYPE, true> &data, in
}

template<class DATATYPE>
void FiszTransform<DATATYPE>::fisz1D (to_array<DATATYPE, true> &data)
void FiszTransform<DATATYPE>::fisz1D (convert_to_array<DATATYPE, true> &data)
{
double ca, cd;
int len = data.nx();
if (len <= 1) return;
else if (!is_power_of_2(len))
throw DataSizeException(len, "data size not of power of two");
to_array<DATATYPE, true> *temp = new to_array<DATATYPE, true>(len);
convert_to_array<DATATYPE, true> *temp = new convert_to_array<DATATYPE, true>(len);

// decomposition by Haar transform and modification of detail coefficients
while (len > 1)
Expand Down Expand Up @@ -193,14 +193,14 @@ void FiszTransform<DATATYPE>::fisz1D (to_array<DATATYPE, true> &data)
}

template<class DATATYPE>
void FiszTransform<DATATYPE>::ifisz1D (to_array<DATATYPE, true> &data)
void FiszTransform<DATATYPE>::ifisz1D (convert_to_array<DATATYPE, true> &data)
{
double ca, cd;
int len = data.nx();
if (len <= 1) return;
else if (!is_power_of_2(len))
throw DataSizeException(len, "data size not of power of two");
to_array<DATATYPE, true> *temp = new to_array<DATATYPE, true>(len);
convert_to_array<DATATYPE, true> *temp = new convert_to_array<DATATYPE, true>(len);

// decomposition by Haar transform
while (len > 1)
Expand Down Expand Up @@ -232,7 +232,7 @@ void FiszTransform<DATATYPE>::ifisz1D (to_array<DATATYPE, true> &data)
}

template<class DATATYPE>
void FiszTransform<DATATYPE>::fisz2D (to_array<DATATYPE, true> &data)
void FiszTransform<DATATYPE>::fisz2D (convert_to_array<DATATYPE, true> &data)
{
double ca, dh, dv, dd;
int s, offsetx, offsety;
Expand All @@ -242,7 +242,7 @@ void FiszTransform<DATATYPE>::fisz2D (to_array<DATATYPE, true> &data)
throw DataSizeException(len1, "data size not of power of two");
else if (!is_power_of_2(len2))
throw DataSizeException(len2, "data size not of power of two");
to_array<DATATYPE, true> *temp = new to_array<DATATYPE, true>(len1, len2);
convert_to_array<DATATYPE, true> *temp = new convert_to_array<DATATYPE, true>(len1, len2);

// decomposition by Haar transform and modification of detail coefficients
while ((len1 > 1) && (len2 > 1))
Expand Down Expand Up @@ -318,7 +318,7 @@ void FiszTransform<DATATYPE>::fisz2D (to_array<DATATYPE, true> &data)
}

template<class DATATYPE>
void FiszTransform<DATATYPE>::ifisz2D (to_array<DATATYPE, true> &data)
void FiszTransform<DATATYPE>::ifisz2D (convert_to_array<DATATYPE, true> &data)
{
double ca, dh, dv, dd;
int s, offsetx, offsety;
Expand All @@ -328,7 +328,7 @@ void FiszTransform<DATATYPE>::ifisz2D (to_array<DATATYPE, true> &data)
throw DataSizeException(len1, "data size not of power of two");
else if (!is_power_of_2(len2))
throw DataSizeException(len2, "data size not of power of two");
to_array<DATATYPE, true> *temp = new to_array<DATATYPE, true>(len1, len2);
convert_to_array<DATATYPE, true> *temp = new convert_to_array<DATATYPE, true>(len1, len2);

// decomposition by Haar transform
while ((len1 > 1) && (len2 > 1))
Expand Down Expand Up @@ -396,7 +396,7 @@ void FiszTransform<DATATYPE>::ifisz2D (to_array<DATATYPE, true> &data)
}

template<class DATATYPE>
void FiszTransform<DATATYPE>::fisz3D (to_array<DATATYPE, true> &data)
void FiszTransform<DATATYPE>::fisz3D (convert_to_array<DATATYPE, true> &data)
{
int len1 = data.nx(), len2 = data.ny(), len3 = data.nz();
int len = MIN(MIN(len1, len2), len3);
Expand All @@ -409,7 +409,7 @@ void FiszTransform<DATATYPE>::fisz3D (to_array<DATATYPE, true> &data)
throw DataSizeException(len3, "data size not of power of two");

int s = iilog2(len);
to_array<DATATYPE, true> *coef = new to_array<DATATYPE, true>[7*s + 1];
convert_to_array<DATATYPE, true> *coef = new convert_to_array<DATATYPE, true>[7*s + 1];

dblarray dfilterh(2), dfilterg(2), rfilterh(2), rfilterg(2);
dfilterh(0) = .5; dfilterh(1) = .5; dfilterg(0) = -.5; dfilterg(1) = .5;
Expand Down Expand Up @@ -449,7 +449,7 @@ void FiszTransform<DATATYPE>::fisz3D (to_array<DATATYPE, true> &data)
}

template<class DATATYPE>
void FiszTransform<DATATYPE>::ifisz3D (to_array<DATATYPE, true> &data)
void FiszTransform<DATATYPE>::ifisz3D (convert_to_array<DATATYPE, true> &data)
{
int len1 = data.nx(), len2 = data.ny(), len3 = data.nz();
int len = MIN(MIN(len1, len2), len3);
Expand All @@ -462,7 +462,7 @@ void FiszTransform<DATATYPE>::ifisz3D (to_array<DATATYPE, true> &data)
throw DataSizeException(len3, "data size not of power of two");

int s = iilog2(len);
to_array<DATATYPE, true> *coef = new to_array<DATATYPE, true>[7*s + 1];
convert_to_array<DATATYPE, true> *coef = new convert_to_array<DATATYPE, true>[7*s + 1];

dblarray dfilterh(2), dfilterg(2), rfilterh(2), rfilterg(2);
dfilterh(0) = .5; dfilterh(1) = .5; dfilterg(0) = -.5; dfilterg(1) = .5;
Expand Down
Loading
Loading