chizeta/cnorxz
chizeta/cnorxz
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename namespaces

Browse source
This commit is contained in:
Christian Zimmermann 2021-07-28 20:29:56 +02:00
parent e3d4c34962
commit c5e6003fc9
76 changed files with 148 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/include/allocator.h
View file

@ -12,7 +12,7 @@
#define MIB_SIZE 1024*1024 // 1MiB
#define WARN_SIZE MIB_SIZE*100 // 100 MiB
namespace MultiArrayHelper
namespace CNORXZInternal
{
template <typename T>
@ -65,12 +65,12 @@ namespace MultiArrayHelper
}
} // namespace MultiArrayHelper
} // namespace CNORXZInternal
namespace MultiArrayTools
namespace CNORXZ
{
template <typename T>
using vector = std::vector<T,MultiArrayHelper::Allocator<T>>;
using vector = std::vector<T,CNORXZInternal::Allocator<T>>;
template <typename T>
inline std::vector<T> toStdVec(const vector<T>& v)
@ -84,6 +84,6 @@ namespace MultiArrayTools
return vector<T>(v.begin(), v.end());
}
} // namespace MultiArrayTools
} // namespace CNORXZ
#endif

2
src/include/arith.cc.h
View file

@ -1,7 +1,7 @@
#include "arith.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <class F>

4
src/include/arith.h
View file

@ -4,7 +4,7 @@
#include <functional>
namespace MultiArrayTools
namespace CNORXZ
{
//template <typename T, class F, typename... As>
@ -206,7 +206,7 @@ namespace MultiArrayTools
}
};
} // end namespace MultiArrayHelper
} // end namespace CNORXZInternal
#include "arith.cc.h"

2
src/include/basic_types.h
View file

@ -3,7 +3,7 @@
#include <string>
namespace MultiArrayTools
namespace CNORXZ
{
// just to fix this forever:

4
src/include/container_index.cc.h
View file

@ -1,7 +1,7 @@
#include "container_index.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename T, class... Indices>
@ -437,4 +437,4 @@ namespace MultiArrayTools
return IB::mPos >= it.pos();
}
} // namespace MultiArrayTools
} // namespace CNORXZ

4
src/include/container_index.h
View file

@ -13,7 +13,7 @@
#include "statics/static_for.h"
#include "ranges/range_helper.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename T, class... Indices>
@ -302,6 +302,6 @@ namespace MultiArrayTools
};
} // end namespace MultiArrayTools
} // end namespace CNORXZ
#endif

2
src/include/conversions.h
View file

@ -5,7 +5,7 @@
#include "cxz_array.h"
#include "slice.h"
namespace MultiArrayTools
namespace CNORXZ
{
namespace ConversionSizes

2
src/include/cxz_array.cc.h
View file

@ -2,7 +2,7 @@
#include "cxz_array.h"
#include "statics/static_for.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename T>
Scalar<T> scalar(const T& in)

2
src/include/cxz_array.h
View file

@ -8,7 +8,7 @@
#include "cxz_array_base.h"
#include "ranges/anonymous_range.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename T>
struct ArrayCatter;

4
src/include/cxz_array_base.cc.h
View file

@ -1,7 +1,7 @@
#include "cxz_array_base.h"
namespace MultiArrayTools
namespace CNORXZ
{
/**********************
@ -270,5 +270,5 @@ namespace MultiArrayTools
return ConstOperationRoot<T,MappedRanges...>(*this, inds...);
}
} // end namespace MultiArrayTools
} // end namespace CNORXZ

4
src/include/cxz_array_base.h
View file

@ -13,7 +13,7 @@
#include "ranges/rheader.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <class IndexType>
@ -178,7 +178,7 @@ namespace MultiArrayTools
};
} // end namespace MultiArrayTools
} // end namespace CNORXZ
/* ========================= *
* --- TEMPLATE CODE --- *

4
src/include/cxz_operation.cc.h
View file

@ -8,11 +8,11 @@
* --- TEMPLATE CODE --- *
* ========================= */
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
/***************************

4
src/include/cxz_operation.h
View file

@ -21,12 +21,12 @@
#include "statics/static_for.h"
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
template <typename T, class OperationClass>

4
src/include/dynamic_operation.cc.h
View file

@ -2,7 +2,7 @@
#include "dynamic_operation.h"
#include "helper_tools.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename T, class Operation>
T DynamicOperation<T,Operation>::get(const DExtT& pos) const
@ -195,4 +195,4 @@ namespace MultiArrayTools
return std::make_shared<DynamicOuterOp<T,Operation,Ranges...>>(*this);
}
} // namespace MultiArrayTools
} // namespace CNORXZ

4
src/include/dynamic_operation.h
View file

@ -5,7 +5,7 @@
#include "base_def.h"
#include "cxz_operation.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename T>
@ -204,6 +204,6 @@ namespace MultiArrayTools
};
*/
} // namespace MultiArrayTools
} // namespace CNORXZ
#endif

4
src/include/functional_array.cc.h
View file

@ -1,7 +1,7 @@
#include "functional_array.h"
namespace MultiArrayTools
namespace CNORXZ
{
@ -96,4 +96,4 @@ namespace MultiArrayTools
return mkOperation( mFunc, MetaOperationRoot<SRanges>( inds ) ... );
}
} // namespace MultiArrayTools
} // namespace CNORXZ

4
src/include/functional_array.h
View file

@ -5,7 +5,7 @@
#include "cxz_array_base.h"
#include "slice.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename T, class Function, class... SRanges>
@ -51,7 +51,7 @@ namespace MultiArrayTools
};
} // namespace MultiArrayTools
} // namespace CNORXZ
/* ========================= *
* --- TEMPLATE CODE --- *

2
src/include/helper_tools.cc.h
View file

@ -1,7 +1,7 @@
#include "helper_tools.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename... T>
std::ostream& operator<<(std::ostream& out, const std::tuple<T...>& tp)

10
src/include/helper_tools.h
View file

@ -9,7 +9,7 @@
#include <functional>
#include "xfor/iloop.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename... T>
@ -173,16 +173,16 @@ namespace MultiArrayTools
auto mkILoop(const OpTp& opTp, const IndTp& indTp, const VarTp& varTp, const LTp& lTp,
const std::array<size_t,std::tuple_size<LTp>::value>& umpos,
const std::array<size_t,std::tuple_size<VarTp>::value>& setzero)
-> MultiArrayHelper::ILoop<OpTp,IndTp,VarTp,LTp>
-> CNORXZInternal::ILoop<OpTp,IndTp,VarTp,LTp>
{
return MultiArrayHelper::ILoop<OpTp,IndTp,VarTp,LTp>(opTp, indTp, varTp, lTp, umpos, setzero);
return CNORXZInternal::ILoop<OpTp,IndTp,VarTp,LTp>(opTp, indTp, varTp, lTp, umpos, setzero);
}
template <class CF>
auto mkPILoop(const CF& cf)
-> MultiArrayHelper::PILoop<CF>
-> CNORXZInternal::PILoop<CF>
{
return MultiArrayHelper::PILoop<CF>(cf);
return CNORXZInternal::PILoop<CF>(cf);
}
template <class IndexType>

2
src/include/high_level_operation.cc.h
View file

@ -1,7 +1,7 @@
#include "high_level_operation.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename T, class Op>

2
src/include/high_level_operation.h
View file

@ -6,7 +6,7 @@
#include "ranges/rheader.h"
#include "dynamic_operation.h"
namespace MultiArrayTools
namespace CNORXZ
{
typedef ClassicRange CR;

4
src/include/map_range.cc.h
View file

@ -2,12 +2,12 @@
#include "map_range.h"
#include <type_traits>
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
/**************

4
src/include/map_range.h
View file

@ -18,11 +18,11 @@
#include "xfor/xfor.h"
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}

2
src/include/map_range_factory_product_map.h
View file

@ -8,7 +8,7 @@
#include "ranges/rbase_def.h"
#include "mbase_def.h"
namespace MultiArrayTools
namespace CNORXZ
{
class MapRangeFactoryProductMap
{

2
src/include/mbase_def.h
View file

@ -5,7 +5,7 @@
#include "ranges/rbase_def.h"
#include "allocator.h"
namespace MultiArrayTools
namespace CNORXZ
{
/***********************
* Provided Types *

2
src/include/operation_def.h
View file

@ -4,7 +4,7 @@
#include "cxz_operation.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename T, class OperationClass>

8
src/include/ranges/anonymous_range.h
View file

@ -11,7 +11,7 @@
#include "ranges/x_to_string.h"
#include "ranges/type_map.h"
namespace MultiArrayTools
namespace CNORXZ
{
typedef GenSingleIndex<size_t,SpaceType::ANON,MUI> AnonymousIndex;
@ -133,7 +133,7 @@ namespace MultiArrayTools
* --- TEMPLATE CODE --- *
* ========================= */
namespace MultiArrayTools
namespace CNORXZ
{
/***********************
@ -171,7 +171,7 @@ namespace MultiArrayTools
std::shared_ptr<AnonymousRange> defaultRange(size_t size = 0);
}
namespace MultiArrayTools
namespace CNORXZ
{
namespace RangeHelper
{
@ -202,7 +202,7 @@ namespace MultiArrayTools
}
}
namespace MultiArrayTools
namespace CNORXZ
{
/***********************
* AnonymousRange *

4
src/include/ranges/dynamic_meta.h
View file

@ -7,7 +7,7 @@
#include "allocator.h"
namespace MultiArrayTools
namespace CNORXZ
{
typedef std::pair<const char*,size_t> DynamicMetaElem;
@ -66,6 +66,6 @@ namespace MultiArrayTools
};
} // namespace MultiArrayTools
} // namespace CNORXZ
#endif

8
src/include/ranges/dynamic_range.cc.h
View file

@ -1,11 +1,11 @@
#include "ranges/dynamic_range.h"
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
@ -186,9 +186,9 @@ namespace MultiArrayTools
}
} // end namespace MultiArrayTools
} // end namespace CNORXZ
namespace MultiArrayTools
namespace CNORXZ
{
namespace RangeHelper
{

8
src/include/ranges/dynamic_range.h
View file

@ -17,11 +17,11 @@
#include "index_wrapper.h"
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
class DynamicIndex : public IndexInterface<DynamicIndex,vector<char>>
@ -223,10 +223,10 @@ namespace MultiArrayTools
};
} // namespace MultiArrayTools
} // namespace CNORXZ
namespace MultiArrayTools
namespace CNORXZ
{
namespace RangeHelper
{

4
src/include/ranges/index_base.h
View file

@ -13,7 +13,7 @@
#include "xfor/xfor.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <class I, typename MetaType>
@ -106,7 +106,7 @@ namespace MultiArrayTools
* --- TEMPLATE CODE --- *
* ========================= */
namespace MultiArrayTools
namespace CNORXZ
{
/**********************
* IndexInterface *

2
src/include/ranges/index_type.h
View file

@ -2,7 +2,7 @@
#ifndef __index_type_h__
#define __index_type_h__
namespace MultiArrayTools
namespace CNORXZ
{
enum class IndexType{
SINGLE = 0,

2
src/include/ranges/index_wrapper.cc.h
View file

@ -2,7 +2,7 @@
#include "index_wrapper.h"
#include "range_helper.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <class Index>

4
src/include/ranges/index_wrapper.h
View file

@ -6,11 +6,11 @@
#include "xfor/xfor.h"
#include "ranges/rheader.h"
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
class IndexWrapperBase

8
src/include/ranges/multi_range.h
View file

@ -18,11 +18,11 @@
#include "statics/static_for.h"
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
template <class... Indices>
@ -218,12 +218,12 @@ namespace MultiArrayTools
* --- TEMPLATE CODE --- *
* ========================= */
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
// -> define in range_base.cc

2
src/include/ranges/multi_range_factory_product_map.h
View file

@ -7,7 +7,7 @@
#include <map>
#include "ranges/rbase_def.h"
namespace MultiArrayTools
namespace CNORXZ
{
class MultiRangeFactoryProductMap
{

4
src/include/ranges/range_base.h
View file

@ -9,12 +9,12 @@
#include "rbase_def.h"
namespace MultiArrayTools
namespace CNORXZ
{
class RangeBase;
}
namespace MultiArrayTools
namespace CNORXZ
{
size_t indexId();

8
src/include/ranges/range_helper.h
View file

@ -2,7 +2,7 @@
#ifndef __range_helper_h__
#define __range_helper_h__
namespace MultiArrayTools
namespace CNORXZ
{
namespace RangeHelper
{
@ -167,7 +167,7 @@ namespace MultiArrayTools
RangeTuple& rtp, size_t off, size_t size, SIZET... sizes)
{
constexpr size_t tps = std::tuple_size<RangeTuple>::value;
::MultiArrayTools::RangeHelper::resolveSetRange(std::get<N>(rtp), orig, off, size);
::CNORXZ::RangeHelper::resolveSetRange(std::get<N>(rtp), orig, off, size);
if constexpr(N < tps-1){
resolveRangeType<N+1>(orig, rtp, off+size, sizes...);
}
@ -178,7 +178,7 @@ namespace MultiArrayTools
RangeTuple& rtp, size_t off, size_t size)
{
constexpr size_t tps = std::tuple_size<RangeTuple>::value;
::MultiArrayTools::RangeHelper::resolveSetRange(std::get<N>(rtp), orig, off, size);
::CNORXZ::RangeHelper::resolveSetRange(std::get<N>(rtp), orig, off, size);
}
template <size_t N, class MetaType, class... Ranges>
@ -280,6 +280,6 @@ namespace MultiArrayTools
}
} // namespace RangeHelper
} // namespace MultiArrayTools
} // namespace CNORXZ
#endif

2
src/include/ranges/range_types/classic_range.h
View file

@ -10,7 +10,7 @@
#ifndef __range_type_classic_def__
#define __range_type_classic_def__
namespace MultiArrayTools
namespace CNORXZ
{
typedef GenSingleIndex<size_t,SpaceType::NONE,MUI> ClassicIndex;

2
src/include/ranges/range_types/null_range.h
View file

@ -10,7 +10,7 @@ include_range_type(NUL,-2)
#ifndef __range_type_null_def__
#define __range_type_null_def__
namespace MultiArrayTools
namespace CNORXZ
{
typedef GenSingleIndex<size_t,SpaceType::NUL,0> NullIndex;

2
src/include/ranges/range_types/space_range.h
View file

@ -8,7 +8,7 @@ include_range_type(PSPACE,3) // Periodic 1dim space
#ifndef __range_type_space_def__
#define __range_type_space_def__
namespace MultiArrayTools
namespace CNORXZ
{
// Periodic 1dim space
typedef GenSingleIndex<int,SpaceType::PSPACE,MUI> XSpaceIndex;

2
src/include/ranges/range_types/spin_range.h
View file

@ -10,7 +10,7 @@ include_range_type(SPIN,2)
#ifndef __range_type_spin_def__
#define __range_type_spin_def__
namespace MultiArrayTools
namespace CNORXZ
{
typedef GenSingleIndex<size_t,SpaceType::SPIN,4> SpinIndex;

2
src/include/ranges/rbase_def.h
View file

@ -17,7 +17,7 @@
#include "allocator.h"
#define MUI static_cast<size_t>(-1)
namespace MultiArrayTools
namespace CNORXZ
{
template <class R>

6
src/include/ranges/single_range.h
View file

@ -16,11 +16,11 @@
#include "xfor/for_type.h"
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
@ -327,7 +327,7 @@ namespace MultiArrayTools
* --- TEMPLATE CODE --- *
* ========================= */
namespace MultiArrayTools
namespace CNORXZ
{
/******************
* GenSingleIndex *

8
src/include/ranges/subrange.h
View file

@ -15,11 +15,11 @@
#include "xfor/for_type.h"
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
template <class Index>
@ -154,9 +154,9 @@ namespace MultiArrayTools
};
} // namespace MultiArrayTools
} // namespace CNORXZ
namespace MultiArrayTools
namespace CNORXZ
{
/*****************

2
src/include/ranges/type_map.h
View file

@ -10,7 +10,7 @@
#include "allocator.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <size_t N>

10
src/include/ranges/value_range.h
View file

@ -17,12 +17,12 @@
#include "xfor/for_type.h"
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
template <typename U>
@ -138,13 +138,13 @@ namespace MultiArrayTools
ValueRange() = default;
};
} // namespace MultiArrayTools
} // namespace CNORXZ
/* ========================= *
* --- TEMPLATE CODE --- *
* ========================= */
namespace MultiArrayTools
namespace CNORXZ
{
/*****************
* ValueIndex *
@ -410,6 +410,6 @@ namespace MultiArrayTools
}
} // namespace MultiArrayTools
} // namespace CNORXZ
#endif

4
src/include/ranges/x_to_string.h
View file

@ -10,7 +10,7 @@
#include "ranges/dynamic_meta.h"
namespace MultiArrayHelper
namespace CNORXZInternal
{
template <typename T>
inline std::string xToString(const T& x);
@ -22,7 +22,7 @@ namespace MultiArrayHelper
template <>
inline std::string xToString<std::string>(const std::string& x);
using MultiArrayTools::DynamicMetaT;
using CNORXZ::DynamicMetaT;
template <>
inline std::string xToString<DynamicMetaT>(const DynamicMetaT& x);

4
src/include/slice.cc.h
View file

@ -1,7 +1,7 @@
#include "slice.h"
namespace MultiArrayTools
namespace CNORXZ
{
/*******************
@ -296,5 +296,5 @@ namespace MultiArrayTools
}
} // end namespace MultiArrayTools
} // end namespace CNORXZ

4
src/include/slice.h
View file

@ -5,7 +5,7 @@
#include "cxz_array_base.h"
#include "cxz_operation.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename T, class... SRanges>
class ConstSlice : public MultiArrayBase<T,SRanges...>
@ -188,7 +188,7 @@ namespace MultiArrayTools
return SliceDef<T,Ranges...>::mkSlice(ind, op);
}
} // end namespace MultiArrayTools
} // end namespace CNORXZ
/* ========================= *
* --- TEMPLATE CODE --- *

4
src/include/statics/static_for.h
View file

@ -4,7 +4,7 @@
#include <cstdlib>
namespace MultiArrayTools
namespace CNORXZ
{
template <size_t BEG, size_t END, int OFF, typename Incr, typename F>
inline auto sfor(Incr incr, F f)
@ -94,7 +94,7 @@ namespace MultiArrayTools
#define MA_DEC [&](auto i) constexpr { return i-1; }
#define MA_ZCONC [&](auto a, auto b) { return 0; }
namespace MultiArrayTools
namespace CNORXZ
{
template <size_t BEG, size_t END, typename F>
inline auto sfor_p(F f)

2
src/include/statics/traits.h
View file

@ -1,7 +1,7 @@
#include "base_def.h"
namespace MultiArrayTools
namespace CNORXZ
{
template <typename T>

6
src/include/type_operations.h
View file

@ -13,11 +13,11 @@
#include <cmath>
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
// MultiArray
@ -518,6 +518,6 @@ namespace MultiArrayTools
return out;
}
} // namespace MultiArrayTools
} // namespace CNORXZ
#endif

8
src/include/xfor/exttype.h
View file

@ -4,7 +4,7 @@
#include <array>
namespace MultiArrayHelper
namespace CNORXZInternal
{
struct None;
@ -375,13 +375,13 @@ namespace MultiArrayHelper
return getX<I>(et).get();
}
} // end namespace MultiArrayHelper
} // end namespace CNORXZInternal
/* ========================= *
* --- TEMPLATE CODE --- *
* ========================= */
namespace MultiArrayHelper
namespace CNORXZInternal
{
template <class X>
@ -517,7 +517,7 @@ namespace MultiArrayHelper
return getX<N>(*this);
}
} // end namespace MultiArrayHelper
} // end namespace CNORXZInternal
#endif

4
src/include/xfor/for_type.h
View file

@ -2,7 +2,7 @@
#ifndef __for_type_h__
#define __for_type_h__
namespace MultiArrayHelper
namespace CNORXZInternal
{
enum class ForType {
@ -17,7 +17,7 @@ namespace MultiArrayHelper
class PFor;
} // end namespace MultiArrayHelper
} // end namespace CNORXZInternal
#endif

4
src/include/xfor/for_utils.h
View file

@ -6,7 +6,7 @@
#include <array>
#include <tuple>
namespace MultiArrayHelper
namespace CNORXZInternal
{
namespace {
template <class Op>
@ -34,6 +34,6 @@ namespace MultiArrayHelper
};
} // end namespace MultiArrayHelper
} // end namespace CNORXZInternal
#endif

2
src/include/xfor/iloop.h
View file

@ -9,7 +9,7 @@
#include <omp.h>
#include "xfor.h"
namespace MultiArrayHelper
namespace CNORXZInternal
{
template <size_t N>
struct NN

10
src/include/xfor/xfor.h
View file

@ -15,9 +15,9 @@
#define VCHECK(a) std::cout << __FILE__ << ": @" << __LINE__ \
<< " in " << __func__ << ": " << #a << " = " << a << std::endl;
namespace MultiArrayHelper
namespace CNORXZInternal
{
using namespace MultiArrayTools;
using namespace CNORXZ;
// 'HIDDEN FOR' CLASS for nested for loops in contractions a.s.o.
// (NO COUNTING OF MASTER POSITION !!!!!)
@ -562,7 +562,7 @@ namespace MultiArrayHelper
};
} // namespace MultiArrayHelper
} // namespace CNORXZInternal
/* ========================= *
* --- TEMPLATE CODE --- *
@ -570,7 +570,7 @@ namespace MultiArrayHelper
#include <iostream>
namespace MultiArrayHelper
namespace CNORXZInternal
{
template <class ExtType>
const ExtType& ExtBase::expl() const
@ -1035,6 +1035,6 @@ namespace MultiArrayHelper
} // namespace MultiArrayHelper
} // namespace CNORXZInternal
#endif

2
src/lib/high_level_operation.cc
View file

@ -2,7 +2,7 @@
#include "cnorxz.h"
#include "hl_cnorxz.h"
namespace MultiArrayTools
namespace CNORXZ
{
std::shared_ptr<DynamicIndex> mkSubSpaceX(const std::shared_ptr<DynamicIndex>& di,
size_t max)

2
src/lib/map_range_factory_product_map.cc
View file

@ -1,7 +1,7 @@
#include "map_range_factory_product_map.h"
namespace MultiArrayTools
namespace CNORXZ
{
std::map<std::shared_ptr<RangeBase>,vector<std::intptr_t> > MapRangeFactoryProductMap::mAleadyCreated;
}

6
src/lib/mk_hl_op.sh
View file

@ -12,7 +12,7 @@ for x in $(cat ../include/extensions/math.h) ; do
echo "#include \"cnorxz.h\"" >> ${file}
echo "#include \"hl_cnorxz.h\"" >> ${file}
echo "" >> ${file}
echo "namespace MultiArrayTools" >> ${file}
echo "namespace CNORXZ" >> ${file}
echo "{" >> ${file}
echo " template class HighLevelOp<OpCD,x_${fff}<double>,1>;" >> ${file}
echo " template class HighLevelOp<OpD,x_${fff}<double>,1>;" >> ${file}
@ -27,7 +27,7 @@ for fff in plus minus multiplies divides ; do
echo "#include \"cnorxz.h\"" >> ${file}
echo "#include \"hl_cnorxz.h\"" >> ${file}
echo "" >> ${file}
echo "namespace MultiArrayTools" >> ${file}
echo "namespace CNORXZ" >> ${file}
echo "{" >> ${file}
echo " template class HighLevelOp<OpCD,${fff}x<double,double>,2>;" >> ${file}
echo " template class HighLevelOp<OpD,${fff}x<double,double>,2>;" >> ${file}
@ -40,7 +40,7 @@ for fff in negate ; do
echo "#include \"cnorxz.h\"" >> ${file}
echo "#include \"hl_cnorxz.h\"" >> ${file}
echo "" >> ${file}
echo "namespace MultiArrayTools" >> ${file}
echo "namespace CNORXZ" >> ${file}
echo "{" >> ${file}
echo " template class HighLevelOp<OpCD,${fff}<double>,1>;" >> ${file}
echo " template class HighLevelOp<OpD,${fff}<double>,1>;" >> ${file}

4
src/lib/ranges/anonymous_range.cc
View file

@ -3,7 +3,7 @@
#include "ranges/ranges_header.cc.h"
#include "ma_assert.h"
namespace MultiArrayTools
namespace CNORXZ
{
/******************************
* AnonymousRangeFactory *
@ -294,4 +294,4 @@ namespace MultiArrayTools
} // end namespace MultiArrayTools
} // end namespace CNORXZ

4
src/lib/ranges/dynamic_meta.cc
View file

@ -4,7 +4,7 @@
#include "ranges/dynamic_meta.h"
#include "ranges/ranges_header.cc.h"
namespace MultiArrayTools
namespace CNORXZ
{
/*********************
@ -45,4 +45,4 @@ namespace MultiArrayTools
} // namespace MultiArrayTools
} // namespace CNORXZ

6
src/lib/ranges/dynamic_range.cc
View file

@ -3,11 +3,11 @@
#include "ranges/ranges_header.cc.h"
#include "ma_assert.h"
namespace MultiArrayTools
namespace CNORXZ
{
namespace
{
using namespace MultiArrayHelper;
using namespace CNORXZInternal;
}
@ -484,5 +484,5 @@ namespace MultiArrayTools
return mOrig;
}
} // end namespace MultiArrayTools
} // end namespace CNORXZ

2
src/lib/ranges/multi_range_factory_product_map.cc
View file

@ -2,7 +2,7 @@
#include "ranges/multi_range_factory_product_map.h"
#include "ranges/ranges_header.cc.h"
namespace MultiArrayTools
namespace CNORXZ
{
std::map<std::shared_ptr<RangeBase>,vector<std::intptr_t> > MultiRangeFactoryProductMap::mAleadyCreated;
}

6
src/lib/ranges/range_base.cc
View file

@ -11,10 +11,10 @@
#include <algorithm>
namespace MultiArrayTools
namespace CNORXZ
{
//using namespace MultiArrayHelpers;
//using namespace CNORXZInternals;
template <class... Ranges>
using STP = std::tuple<std::shared_ptr<Ranges>...>;
@ -215,4 +215,4 @@ namespace MultiArrayTools
return reinterpret_cast<std::intptr_t>(this);
}
} // end namespace MultiArrayTools
} // end namespace CNORXZ

2
src/lib/ranges/range_types/classic_range.cc
View file

@ -3,7 +3,7 @@
#include "ranges/x_to_string.h"
#include "ranges/ranges_header.cc.h"
namespace MultiArrayTools
namespace CNORXZ
{
/********************
* GenSingleRange *

2
src/lib/ranges/range_types/null_range.cc
View file

@ -3,7 +3,7 @@
#include "ranges/x_to_string.h"
#include "ranges/ranges_header.cc.h"
namespace MultiArrayTools
namespace CNORXZ
{
std::shared_ptr<NullRF> mkNUL(const char* dp, size_t size)
{

2
src/lib/ranges/range_types/space_range.cc
View file

@ -3,7 +3,7 @@
#include "ranges/x_to_string.h"
#include "ranges/ranges_header.cc.h"
namespace MultiArrayTools
namespace CNORXZ
{
std::shared_ptr<PSpaceRF> mkPSPACE(const char* dp, size_t size)
{

2
src/lib/ranges/range_types/spin_range.cc
View file

@ -3,7 +3,7 @@
#include "ranges/x_to_string.h"
#include "ranges/ranges_header.cc.h"
namespace MultiArrayTools
namespace CNORXZ
{
std::shared_ptr<SpinRF> mkSPIN(const char* dp, size_t size)
{

2
src/lib/ranges/type_map.cc
View file

@ -2,7 +2,7 @@
#include "ranges/type_map.h"
#include "ranges/ranges_header.cc.h"
namespace MultiArrayTools
namespace CNORXZ
{
#define XCOMMAX() ,
#define include_type(t,n) template struct TypeMap<n>; \

2
src/tests/ma_unit_test.cc
View file

@ -6,7 +6,7 @@
#include "cnorxz.h"
namespace MAT = MultiArrayTools;
namespace MAT = CNORXZ;
namespace {

2
src/tests/op_perf_test.cc
View file

@ -13,7 +13,7 @@
#define ONLY_SPIN
namespace MAT = MultiArrayTools;
namespace MAT = CNORXZ;
namespace {

2
src/tests/ranges/anonymous_unit_test.cc
View file

@ -8,7 +8,7 @@
#include "cnorxz.h"
//#include "ranges/ranges_header.cc.h"
namespace MAT = MultiArrayTools;
namespace MAT = CNORXZ;
namespace {

2
src/tests/ranges/index_unit_test.cc
View file

@ -6,7 +6,7 @@
#include "cnorxz.h"
namespace MAT = MultiArrayTools;
namespace MAT = CNORXZ;
namespace {

2
src/tests/test_header.h
View file

@ -9,7 +9,7 @@
#include <ctime>
#include <cmath>
namespace MAT = MultiArrayTools;
namespace MAT = CNORXZ;
double xround(double arg)
{