Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions fftTiffImg/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
* License along with libLiFFT. If not, see <www.gnu.org/licenses/>.
*/

#include <iostream>
#include <string>
#include <boost/program_options.hpp>
#include "tiffWriter/image.hpp"
#include "tiffWriter/traitsAndPolicies.hpp"
#include "libLiFFT/FFT.hpp"
#include "liFFT/FFT.hpp"
#if defined(WITH_CUDA)
# include "libLiFFT/libraries/cuFFT/cuFFT.hpp"
# include "liFFT/libraries/cuFFT/cuFFT.hpp"
using FFT_LIB = LiFFT::libraries::cuFFT::CuFFT<>;
#else
# include "libLiFFT/libraries/fftw/FFTW.hpp"
# include "liFFT/libraries/fftw/FFTW.hpp"
using FFT_LIB = LiFFT::libraries::fftw::FFTW<>;
#endif
#include "libLiFFT/policies/Copy.hpp"
#include "libLiFFT/types/SymmetricWrapper.hpp"
#include "libLiFFT/accessors/TransformAccessor.hpp"
#include "libLiFFT/accessors/TransposeAccessor.hpp"
#include "libLiFFT/policies/CalcIntensityFunctor.hpp"
#include "libLiFFT/types/View.hpp"
#include "libLiFFT/types/SliceView.hpp"
#include "liFFT/policies/Copy.hpp"
#include "liFFT/types/SymmetricWrapper.hpp"
#include "liFFT/accessors/TransformAccessor.hpp"
#include "liFFT/accessors/TransposeAccessor.hpp"
#include "liFFT/policies/CalcIntensityFunctor.hpp"
#include "liFFT/types/View.hpp"
#include "liFFT/types/SliceView.hpp"
#include <boost/program_options.hpp>
#include <chrono>
#include <iostream>
#include <string>

namespace po = boost::program_options;
using std::string;
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions include/libLiFFT/FFT.hpp → include/liFFT/FFT.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

#pragma once

#include "libLiFFT/FFT_Properties.hpp"
#include "liFFT/FFT_Properties.hpp"

// Included for convenience, so only one include is required from user code
#include "libLiFFT/FFT_Definition.hpp"
#include "libLiFFT/FFT_DataWrapper.hpp"
#include "liFFT/FFT_Definition.hpp"
#include "liFFT/FFT_DataWrapper.hpp"
#include <boost/mpl/apply.hpp>

namespace bmpl = boost::mpl;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@

#pragma once

#include "libLiFFT/AutoDetect.hpp"
#include "libLiFFT/traits/NumDims.hpp"
#include "libLiFFT/traits/IsComplex.hpp"
#include "libLiFFT/traits/IsAoS.hpp"
#include "libLiFFT/traits/IsStrided.hpp"
#include "libLiFFT/policies/GetExtents.hpp"
#include "libLiFFT/policies/GetStrides.hpp"
#include "libLiFFT/mem/RealValues.hpp"
#include "libLiFFT/mem/ComplexAoSValues.hpp"
#include "libLiFFT/mem/ComplexSoAValues.hpp"
#include "libLiFFT/mem/DataContainer.hpp"
#include "libLiFFT/traits/IdentityAccessor.hpp"
#include "libLiFFT/traits/IsDeviceMemory.hpp"
#include "libLiFFT/types/SymmetricWrapper.hpp"
#include "libLiFFT/c++14_types.hpp"
#include "libLiFFT/FFT_Memory.hpp"
#include "liFFT/AutoDetect.hpp"
#include "liFFT/traits/NumDims.hpp"
#include "liFFT/traits/IsComplex.hpp"
#include "liFFT/traits/IsAoS.hpp"
#include "liFFT/traits/IsStrided.hpp"
#include "liFFT/policies/GetExtents.hpp"
#include "liFFT/policies/GetStrides.hpp"
#include "liFFT/mem/RealValues.hpp"
#include "liFFT/mem/ComplexAoSValues.hpp"
#include "liFFT/mem/ComplexSoAValues.hpp"
#include "liFFT/mem/DataContainer.hpp"
#include "liFFT/traits/IdentityAccessor.hpp"
#include "liFFT/traits/IsDeviceMemory.hpp"
#include "liFFT/types/SymmetricWrapper.hpp"
#include "liFFT/c++14_types.hpp"
#include "liFFT/FFT_Memory.hpp"
#include <type_traits>
#include <functional>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@

#pragma once

#include "libLiFFT/FFT_Kind.hpp"
#include "libLiFFT/AutoDetect.hpp"
#include "libLiFFT/c++14_types.hpp"
#include "libLiFFT/util.hpp"
#include "libLiFFT/FFT_DataWrapper.hpp"
#include "libLiFFT/FFT_InplaceOutput.hpp"
#include "libLiFFT/types/View.hpp"
#include "libLiFFT/mem/DataContainer.hpp"
#include "libLiFFT/mem/RealValues.hpp"
#include "libLiFFT/mem/ComplexAoSValues.hpp"
#include "liFFT/FFT_Kind.hpp"
#include "liFFT/AutoDetect.hpp"
#include "liFFT/c++14_types.hpp"
#include "liFFT/util.hpp"
#include "liFFT/FFT_DataWrapper.hpp"
#include "liFFT/FFT_InplaceOutput.hpp"
#include "liFFT/types/View.hpp"
#include "liFFT/mem/DataContainer.hpp"
#include "liFFT/mem/RealValues.hpp"
#include "liFFT/mem/ComplexAoSValues.hpp"

namespace LiFFT {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

#pragma once

#include "libLiFFT/accessors/ArrayAccessor.hpp"
#include "libLiFFT/FFT_DataWrapper.hpp"
#include "libLiFFT/c++14_types.hpp"
#include "libLiFFT/traits/IdentityAccessor.hpp"
#include "libLiFFT/types/Real.hpp"
#include "libLiFFT/types/Complex.hpp"
#include "libLiFFT/mem/PlainPtrWrapper.hpp"
#include "liFFT/accessors/ArrayAccessor.hpp"
#include "liFFT/FFT_DataWrapper.hpp"
#include "liFFT/c++14_types.hpp"
#include "liFFT/traits/IdentityAccessor.hpp"
#include "liFFT/types/Real.hpp"
#include "liFFT/types/Complex.hpp"
#include "liFFT/mem/PlainPtrWrapper.hpp"
#include <stdexcept>

namespace LiFFT {
Expand Down
File renamed without changes.
12 changes: 6 additions & 6 deletions include/libLiFFT/FFT_Memory.hpp → include/liFFT/FFT_Memory.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

#pragma once

#include "libLiFFT/policies/Copy.hpp"
#include "libLiFFT/policies/SafePtrCast.hpp"
#include "libLiFFT/traits/NumDims.hpp"
#include "libLiFFT/traits/GetMemSize.hpp"
#include "libLiFFT/policies/GetExtents.hpp"
#include "libLiFFT/accessors/ConvertAccessor.hpp"
#include "liFFT/policies/Copy.hpp"
#include "liFFT/policies/SafePtrCast.hpp"
#include "liFFT/traits/NumDims.hpp"
#include "liFFT/traits/GetMemSize.hpp"
#include "liFFT/policies/GetExtents.hpp"
#include "liFFT/accessors/ConvertAccessor.hpp"
#include <algorithm>

namespace LiFFT {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include "libLiFFT/FFT_Kind.hpp"
#include "liFFT/FFT_Kind.hpp"

namespace LiFFT {
namespace detail {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#pragma once

#include "libLiFFT/util.hpp"
#include "libLiFFT/c++14_types.hpp"
#include "liFFT/util.hpp"
#include "liFFT/c++14_types.hpp"

namespace LiFFT {
namespace accessors {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#pragma once

#include <libLiFFT/policies/flattenIdx.hpp>
#include "libLiFFT/c++14_types.hpp"
#include "libLiFFT/util.hpp"
#include "liFFT/policies/flattenIdx.hpp"
#include "liFFT/c++14_types.hpp"
#include "liFFT/util.hpp"

namespace LiFFT {
namespace accessors {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#pragma once

#include <functional>
#include "libLiFFT/types/Vec.hpp"
#include "libLiFFT/Composite.hpp"
#include "liFFT/types/Vec.hpp"
#include "liFFT/Composite.hpp"

namespace LiFFT {
namespace accessors {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include "libLiFFT/accessors/ArrayAccessor.hpp"
#include "liFFT/accessors/ArrayAccessor.hpp"

namespace LiFFT {
namespace accessors {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include "libLiFFT/c++14_types.hpp"
#include "liFFT/c++14_types.hpp"

namespace LiFFT {
namespace accessors {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include "libLiFFT/traits/IdentityAccessor.hpp"
#include "liFFT/traits/IdentityAccessor.hpp"

namespace LiFFT {
namespace accessors {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

#pragma once

#include "libLiFFT/traits/NumDims.hpp"
#include "libLiFFT/traits/IdentityAccessor.hpp"
#include "libLiFFT/policies/Copy.hpp"
#include "libLiFFT/policies/GetExtents.hpp"
#include "libLiFFT/mem/DataContainer.hpp"
#include "liFFT/traits/NumDims.hpp"
#include "liFFT/traits/IdentityAccessor.hpp"
#include "liFFT/policies/Copy.hpp"
#include "liFFT/policies/GetExtents.hpp"
#include "liFFT/mem/DataContainer.hpp"

namespace LiFFT {

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

#pragma once

#include "libLiFFT/libraries/cuFFT/policies/CudaAllocator.hpp"
#include "libLiFFT/libraries/cuFFT/policies/CudaMemCpy.hpp"
#include "libLiFFT/libraries/cuFFT/policies/Planner.hpp"
#include "libLiFFT/libraries/cuFFT/policies/ExecutePlan.hpp"
#include "liFFT/libraries/cuFFT/policies/CudaAllocator.hpp"
#include "liFFT/libraries/cuFFT/policies/CudaMemCpy.hpp"
#include "liFFT/libraries/cuFFT/policies/Planner.hpp"
#include "liFFT/libraries/cuFFT/policies/ExecutePlan.hpp"
#include <boost/mpl/placeholders.hpp>

namespace bmpl = boost::mpl;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <cuda.h>
#include <cuda_runtime_api.h>
#include "libLiFFT/libraries/cuFFT/cudaSafeCall.hpp"
#include "liFFT/libraries/cuFFT/cudaSafeCall.hpp"

namespace LiFFT {
namespace libraries {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <cuda.h>
#include <cuda_runtime_api.h>
#include "libLiFFT/libraries/cuFFT/cudaSafeCall.hpp"
#include "liFFT/libraries/cuFFT/cudaSafeCall.hpp"

namespace LiFFT {
namespace libraries {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
#include <type_traits>
#include <cufft.h>
#include <string>
#include "libLiFFT/types/TypePair.hpp"
#include "libLiFFT/libraries/cuFFT/Plan.hpp"
#include "libLiFFT/libraries/cuFFT/traits/FFTType.hpp"
#include "libLiFFT/libraries/cuFFT/traits/Sign.hpp"
#include "libLiFFT/libraries/cuFFT/traits/LibTypes.hpp"
#include "libLiFFT/policies/SafePtrCast.hpp"
#include "libLiFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp"
#include "liFFT/types/TypePair.hpp"
#include "liFFT/libraries/cuFFT/Plan.hpp"
#include "liFFT/libraries/cuFFT/traits/FFTType.hpp"
#include "liFFT/libraries/cuFFT/traits/Sign.hpp"
#include "liFFT/libraries/cuFFT/traits/LibTypes.hpp"
#include "liFFT/policies/SafePtrCast.hpp"
#include "liFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp"

namespace LiFFT {
namespace libraries {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#pragma once

#include "libLiFFT/libraries/cuFFT/traits/LibTypes.hpp"
#include "libLiFFT/policies/GetNumElements.hpp"
#include "liFFT/libraries/cuFFT/traits/LibTypes.hpp"
#include "liFFT/policies/GetNumElements.hpp"

namespace LiFFT {
namespace libraries {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
#pragma once

#include <cufft.h>
#include "libLiFFT/types/TypePair.hpp"
#include "libLiFFT/libraries/cuFFT/Plan.hpp"
#include "libLiFFT/libraries/cuFFT/traits/FFTType.hpp"
#include "libLiFFT/libraries/cuFFT/traits/Sign.hpp"
#include "libLiFFT/libraries/cuFFT/traits/LibTypes.hpp"
#include "libLiFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp"
#include "liFFT/types/TypePair.hpp"
#include "liFFT/libraries/cuFFT/Plan.hpp"
#include "liFFT/libraries/cuFFT/traits/FFTType.hpp"
#include "liFFT/libraries/cuFFT/traits/Sign.hpp"
#include "liFFT/libraries/cuFFT/traits/LibTypes.hpp"
#include "liFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp"
#include <cassert>
#include <limits>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#pragma once

#include "libLiFFT/libraries/cuFFT/traits/Types.hpp"
#include "libLiFFT/c++14_types.hpp"
#include "liFFT/libraries/cuFFT/traits/Types.hpp"
#include "liFFT/c++14_types.hpp"

namespace LiFFT {
namespace libraries {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
#pragma once

#include <boost/utility.hpp>
#include "libLiFFT/libraries/fftw/policies/Planner.hpp"
#include "libLiFFT/libraries/fftw/policies/ExecutePlan.hpp"
#include "libLiFFT/libraries/fftw/policies/FreePlan.hpp"
#include "liFFT/libraries/fftw/policies/Planner.hpp"
#include "liFFT/libraries/fftw/policies/ExecutePlan.hpp"
#include "liFFT/libraries/fftw/policies/FreePlan.hpp"
#include <boost/mpl/placeholders.hpp>

namespace bmpl = boost::mpl;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#pragma once

#include "libLiFFT/libraries/fftw/fftw3Include.h"
#include "libLiFFT/libraries/fftw/traits/LibTypes.hpp"
#include "libLiFFT/ignore_unused.hpp"
#include "liFFT/libraries/fftw/fftw3Include.h"
#include "liFFT/libraries/fftw/traits/LibTypes.hpp"
#include "liFFT/ignore_unused.hpp"

namespace LiFFT {
namespace libraries {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#pragma once

#include "libLiFFT/libraries/fftw/fftw3Include.h"
#include "libLiFFT/libraries/fftw/traits/LibTypes.hpp"
#include "liFFT/libraries/fftw/fftw3Include.h"
#include "liFFT/libraries/fftw/traits/LibTypes.hpp"

namespace LiFFT {
namespace libraries {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#pragma once

#include "libLiFFT/libraries/fftw/fftw3Include.h"
#include "libLiFFT/libraries/fftw/traits/LibTypes.hpp"
#include "liFFT/libraries/fftw/fftw3Include.h"
#include "liFFT/libraries/fftw/traits/LibTypes.hpp"

namespace LiFFT {
namespace libraries {
Expand Down
Loading