Skip to content

Use int32_t where Python passes an int32 array #65

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
HazenBabcock merged 2 commits into from
Sep 8, 2026
Merged

Use int32_t where Python passes an int32 array #65

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
1919945
Use int32_t where Python passes an int32 array
HazenBabcock Sep 8, 2026
849e4fa
Give grid3DZInclusive the name it is declared with
HazenBabcock Sep 8, 2026
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
3 changes: 2 additions & 1 deletion storm_analysis/L1H/homotopy_general.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
*/

/* Include */
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
Expand Down Expand Up @@ -300,7 +301,7 @@ void computeG3(void)
*
* vis - user supplied storage for the visited vector.
*/
void getVisited(int *vis)
void getVisited(int32_t *vis)
{
int i;

Expand Down
3 changes: 2 additions & 1 deletion storm_analysis/L1H/homotopy_imagea_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/

/* Include */
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
Expand Down Expand Up @@ -61,7 +62,7 @@ void finishUp(void)
*
* returns - number of peaks that were found.
*/
int getPeaks(double *hres, double *peak_x, double *peak_y, double *peak_i, int *peak_c, int max_peaks)
int getPeaks(double *hres, double *peak_x, double *peak_y, double *peak_i, int32_t *peak_c, int max_peaks)
{
int i,j,n,o_size,t1;
double xt,yt,t,inv_scale;
Expand Down
4 changes: 3 additions & 1 deletion storm_analysis/L1H/homotopy_imagea_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
#ifndef HOMOTOPY_IMAGEA_COMMON_H
#define HOMOTOPY_IMAGEA_COMMON_H

#include <stdint.h>

/* Function Declarations */
void analyzeImage(double *, double *);
void closeFile(void);
void finishUp(void);
int getPeaks(double *, double *, double *, double *, int *, int);
int getPeaks(double *, double *, double *, double *, int32_t *, int);
int openFile(char *);
int saveHighRes(double *, int);
void setImageParameters(double *, int, int, int, double, int, int, int, int, int);
Expand Down
12 changes: 6 additions & 6 deletions storm_analysis/dbscan/dbscan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ typedef struct
// dbscan specific
void appendN(intArr *, intArr *);
intArr* createIntArr(int);
void dbscan(float *, float *, float *, int *, int *, int, float, int, int);
void dbscan(float *, float *, float *, int32_t *, int32_t *, int, float, int, int);
int expandCluster(intArr *, int, float, int, int);
void mergeN(intArr *, intArr *);
intArr* regionQuery(int *, int, int, int, float);
intArr* regionQueryKD(int *, int, int, int, float);

// additional
void clusterSize(int *, int *, int, int);
void locClSize(int *, int *, int, int);
void recategorize(int *, int *, int, int, int);
void locClSize(int32_t *, int32_t *, int, int);
void recategorize(int32_t *, int32_t *, int, int, int);


/* Global Variables */
Expand Down Expand Up @@ -166,7 +166,7 @@ intArr* createIntArr(int n)
* min_points - minimum number of points in a cluster.
* verbose - print cluster information as we go.
*/
void dbscan(float *db_x, float *db_y, float *db_z, int *db_cat, int *db_l, int db_nsize, float eps, int min_points, int verbose)
void dbscan(float *db_x, float *db_y, float *db_z, int32_t *db_cat, int32_t *db_l, int db_nsize, float eps, int min_points, int verbose)
{
int i,cluster_size,cn,counts,cur_cat;
intArr *N;
Expand Down Expand Up @@ -535,7 +535,7 @@ void clusterSize(int *counts, int *cl_id, int cl_size, int max_id)
* cl_size - size of cl_counts (and cl_id).
* max_id - maximum cluster id number.
*/
void locClSize(int *cl_counts, int *cl_id, int cl_size, int max_id)
void locClSize(int32_t *cl_counts, int32_t *cl_id, int cl_size, int max_id)
{
int i;
int *counts;
Expand All @@ -562,7 +562,7 @@ void locClSize(int *cl_counts, int *cl_id, int cl_size, int max_id)
* max_id - maximum cluster id number.
* min_size - minimum acceptable cluster size.
*/
void recategorize(int *cl_id, int *category, int cl_size, int max_id, int min_size)
void recategorize(int32_t *cl_id, int32_t *category, int cl_size, int max_id, int min_size)
{
int i;
int *counts;
Expand Down
5 changes: 3 additions & 2 deletions storm_analysis/frc/frc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
*/

/* Include */
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#include <math.h>

/* Function Declarations */
void calc_frc(double *, double *, double *, int *, int, int);
void calc_frc(double *, double *, double *, int32_t *, int, int);

/*
* calc_frc()
Expand All @@ -42,7 +43,7 @@ void calc_frc(double *, double *, double *, int *, int, int);
* y_size - Size of the FFT array in y (arr.shape[0]).
* x_size - Size of the FFT array in x (arr.shape[1]).
*/
void calc_frc(double *fft1, double *fft2, double *frc, int *frc_counts, int y_size, int x_size)
void calc_frc(double *fft1, double *fft2, double *frc, int32_t *frc_counts, int y_size, int x_size)
{
int cx,cy,dx,dy,i,j,q;
int real,ima;
Expand Down
9 changes: 5 additions & 4 deletions storm_analysis/sa_library/cs_decon_utilities.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@
*/

/* Include */
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>

/* Function Declarations */
int isMaxima(double *, int, int, int, int, int, int);
int label(double *, int *, double, int, int, int, int);
int label(double *, int32_t *, double, int, int, int, int);
void labelImage(double *, int *, double, int, int, int, int, int, int, int);
void moments(double *, double *, int *, int, int, int, int);
void moments(double *, double *, int32_t *, int, int, int, int);

/* Functions */

Expand Down Expand Up @@ -83,7 +84,7 @@ int isMaxima(double *image, int ci, int cj, int ck, int x_size, int y_size, int
*
* Returns the number of unique labels.
*/
int label(double *image, int *labels, double threshold, int margin, int x_size, int y_size, int z_size)
int label(double *image, int32_t *labels, double threshold, int margin, int x_size, int y_size, int z_size)
{
int i,j,k,t;
int cur_label;
Expand Down Expand Up @@ -170,7 +171,7 @@ void labelImage(double *image, int *labels, double threshold, int cur_label, int
* y_size - Image size in y.
* z_size - Image size in z.
*/
void moments(double *image, double *peaks, int *labels, int counts, int x_size, int y_size, int z_size)
void moments(double *image, double *peaks, int32_t *labels, int counts, int x_size, int y_size, int z_size)
{
int i,j,k,l,t;

Expand Down
13 changes: 7 additions & 6 deletions storm_analysis/sa_library/grid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
*/

/* Include */
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>

void grid2D(int *, int *, int *, int, int, int);
void grid3D(int *, int *, int *, int *, int, int, int, int);
void grid3DZInclusive(int *, int *, int *, int *, int, int, int, int);
void grid2D(int32_t *, int32_t *, int32_t *, int, int, int);
void grid3D(int32_t *, int32_t *, int32_t *, int32_t *, int, int, int, int);
void grid3DZInclusive(int32_t *, int32_t *, int32_t *, int32_t *, int, int, int, int);

/*
* grid2D()
Expand All @@ -37,7 +38,7 @@ void grid3DZInclusive(int *, int *, int *, int *, int, int, int, int);
* y_size - grid size in y.
* n_x - number of x (and y) locations.
*/
void grid2D(int *grid, int *i_x, int *i_y, int x_size, int y_size, int n_x)
void grid2D(int32_t *grid, int32_t *i_x, int32_t *i_y, int x_size, int y_size, int n_x)
{
int i,x,y;

Expand All @@ -64,7 +65,7 @@ void grid2D(int *grid, int *i_x, int *i_y, int x_size, int y_size, int n_x)
* z_size - grid size in z.
* n_x - number of x (and y,z) locations.
*/
void grid3D(int *grid, int *i_x, int *i_y, int *i_z, int x_size, int y_size, int z_size, int n_x)
void grid3D(int32_t *grid, int32_t *i_x, int32_t *i_y, int32_t *i_z, int x_size, int y_size, int z_size, int n_x)
{
int i,x,y,z;

Expand Down Expand Up @@ -93,7 +94,7 @@ void grid3D(int *grid, int *i_x, int *i_y, int *i_z, int x_size, int y_size, int
* z_size - grid size in z.
* n_x - number of x (and y,z) locations.
*/
void grid3DInclusize(int *grid, int *i_x, int *i_y, int *i_z, int x_size, int y_size, int z_size, int n_x)
void grid3DZInclusive(int32_t *grid, int32_t *i_x, int32_t *i_y, int32_t *i_z, int x_size, int y_size, int z_size, int n_x)
{
int i,x,y,z;

Expand Down