Skip to content

move include/common to include/finufft_common #734

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

move include/common to include/finufft_common #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions include/common/common.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion include/cufinufft.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <stdint.h>

#include <common/defines.h>
#include <finufft_common/defines.h>
#include <cufinufft_opts.h>
#include <finufft_errors.h>

Expand Down
2 changes: 1 addition & 1 deletion include/cufinufft/defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef CUFINUFFT_DEFS_H
#define CUFINUFFT_DEFS_H

#include <common/common.h>
#include <finufft_common/common.h>
#include <limits>

// FIXME: If cufft ever takes N > INT_MAX...
Expand Down
4 changes: 2 additions & 2 deletions include/cufinufft/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <type_traits>
#include <utility> // for std::forward

#include <common/common.h>
#include <finufft_common/common.h>

#ifndef _USE_MATH_DEFINES
#define _USE_MATH_DEFINES
Expand Down Expand Up @@ -137,7 +137,7 @@ template<typename T> auto arrayrange(int n, T *a, cudaStream_t stream) {

// Writes out w = half-width and c = center of an interval enclosing all a[n]'s
// Only chooses a nonzero center if this increases w by less than fraction
// ARRAYWIDCEN_GROWFRAC defined in common/constants.h.
// ARRAYWIDCEN_GROWFRAC defined in finufft_common/constants.h.
// This prevents rephasings which don't grow nf by much. 6/8/17
// If n==0, w and c are not finite.
template<typename T> auto arraywidcen(int n, T *a, cudaStream_t stream) {
Expand Down
2 changes: 1 addition & 1 deletion include/finufft/finufft_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <cstdint>
#include <memory>

#include "common/common.h"
#include "finufft_common/common.h"
#include "finufft_errors.h"

// All indexing in library that potentially can exceed 2^31 uses 64-bit signed.
Expand Down
4 changes: 2 additions & 2 deletions include/finufft/finufft_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "finufft_core.h"
#include <cmath>
#include <common/common.h>
#include <finufft_common/common.h>

namespace finufft::utils {

Expand All @@ -28,7 +28,7 @@ FINUFFT_EXPORT FINUFFT_ALWAYS_INLINE void FINUFFT_CDECL arraywidcen(BIGINT n, co
T *w, T *c)
// Writes out w = half-width and c = center of an interval enclosing all a[n]'s
// Only chooses a nonzero center if this increases w by less than fraction
// ARRAYWIDCEN_GROWFRAC defined in common/constants.h.
// ARRAYWIDCEN_GROWFRAC defined in finufft_common/constants.h.
// This prevents rephasings which don't grow nf by much. 6/8/17
// If n==0, w and c are not finite.
{
Expand Down
2 changes: 1 addition & 1 deletion include/finufft/test_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <finufft.h>

// convenient private finufft internals that tests need
#include <common/common.h>
#include <finufft_common/common.h>
#include <finufft/finufft_core.h>
#include <finufft/finufft_utils.hpp>
#include <memory>
Expand Down
5 changes: 5 additions & 0 deletions include/finufft_common/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#pragma once

#include <finufft_common/constants.h>
#include <finufft_common/defines.h>
#include <finufft_common/utils.h>
0 include/common/constants.h → include/finufft_common/constants.h
View file
Open in desktop
File renamed without changes.
0 include/common/defines.h → include/finufft_common/defines.h
View file
Open in desktop
File renamed without changes.
0 include/common/utils.h → include/finufft_common/utils.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/finufft_eitherprec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
// the plan object pointed to... (doesn't need to be even defined here)
#define FINUFFT_PLAN_S FINUFFTIFY(_plan_s)

#include <common/defines.h>
#include <finufft_common/defines.h>

////////////////////////////////////////////////////////////////////
// PUBLIC METHOD INTERFACES. All are C-style even when used from C++...
Expand Down
20 changes: 10 additions & 10 deletions iwyu.imp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[
{ "include": [ "@<xsimd/.*>", "private", "<xsimd/xsimd.hpp>", "public" ] },
{ "include": [ "@\"xsimd/.*\"", "private", "<xsimd/xsimd.hpp>", "public" ] },
{ "include": [ "@<xsimd/.*>", "private", "<xsimd/xsimd.hpp>", "public" ] },
{ "include": [ "@\"xsimd/.*\"", "private", "<xsimd/xsimd.hpp>", "public" ] },

{ "include": [ "@<common/.*>", "private", "\"common/common.h\"", "public" ] },
{ "include": [ "@\"common/.*\"", "private", "\"common/common.h\"", "public" ] },
{ "include": [ "@<finufft_common/.*>", "private", "\"finufft_common/common.h\"", "public" ] },
{ "include": [ "@\"finufft_common/.*\"", "private", "\"finufft_common/common.h\"", "public" ] },

{ "include": [ "@<thrust/(.*)>", "private", "<thrust/\\1>", "public" ] },
{ "include": [ "@\"thrust/(.*)\"", "private", "<thrust/\\1>", "public" ] },
{ "include": [ "@<thrust/(.*)>", "private", "<thrust/\\1>", "public" ] },
{ "include": [ "@\"thrust/(.*)\"", "private", "<thrust/\\1>", "public" ] },

{ "include": [ "@<ducc/(.*)>", "private", "<ducc/\\1>", "public" ] },
{ "include": [ "@\"ducc/(.*)\"", "private", "<ducc/\\1>", "public" ] },
{ "include": [ "@<ducc/(.*)>", "private", "<ducc/\\1>", "public" ] },
{ "include": [ "@\"ducc/(.*)\"", "private", "<ducc/\\1>", "public" ] },

{ "include": [ "@<fftw3/.*>", "private", "<fftw3.h>", "public" ] },
{ "include": [ "@\"fftw3/.*\"", "private", "<fftw3.h>", "public" ] }
{ "include": [ "@<fftw3/.*>", "private", "<fftw3.h>", "public" ] },
{ "include": [ "@\"fftw3/.*\"", "private", "<fftw3.h>", "public" ] }
]
2 changes: 1 addition & 1 deletion makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ usage:
@echo "Also see docs/install.rst and docs/README"

# collect headers for implicit depends (we don't separate public from private)
HEADERS = $(wildcard include/*.h include/finufft/*.h include/common/*.h)
HEADERS = $(wildcard include/*.h include/finufft/*.h include/finufft_common/*.h)

# implicit rules for objects (note -o ensures writes to correct dir)
%.o: %.cpp $(HEADERS)
Expand Down
2 changes: 1 addition & 1 deletion src/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <cmath>
#include <common/common.h>
#include <finufft_common/common.h>

#ifdef __CUDACC__
#include <cufinufft/types.h>
Expand Down
2 changes: 1 addition & 1 deletion test/cuda/cufinufft1d_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <thrust/device_vector.h>
#include <thrust/host_vector.h>

#include <common/common.h>
#include <finufft_common/common.h>
#include <cufinufft.h>

#include "../utils/dirft1d.hpp"
Expand Down
2 changes: 1 addition & 1 deletion test/cuda/cufinufft1dspreadinterponly_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <iostream>
#include <random>

#include <common/common.h>
#include <finufft_common/common.h>
#include <cufinufft.h>

#include <cufinufft/contrib/helper_cuda.h>
Expand Down
2 changes: 1 addition & 1 deletion test/cuda/cufinufft2d1nupts_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <iostream>
#include <random>

#include <common/common.h>
#include <finufft_common/common.h>
#include <cufinufft.h>

#include <cufinufft/impl.h>
Expand Down
2 changes: 1 addition & 1 deletion test/cuda/cufinufft2d_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <limits>
#include <random>

#include <common/common.h>
#include <finufft_common/common.h>
#include <cufinufft.h>

#include <cufinufft/impl.h>
Expand Down
2 changes: 1 addition & 1 deletion test/cuda/cufinufft2dmany_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <limits>
#include <random>

#include <common/common.h>
#include <finufft_common/common.h>
#include <cufinufft.h>

#include <cufinufft/impl.h>
Expand Down
2 changes: 1 addition & 1 deletion test/cuda/cufinufft3d_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <iostream>
#include <random>

#include <common/common.h>
#include <finufft_common/common.h>
#include <cufinufft.h>

#include <cufinufft/impl.h>
Expand Down
Loading