ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>#3509

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

Closed
wesm wants to merge 4 commits into from
Closed

ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T> #3509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ccac89
Do not use extern template class with NumericArray<T>
wesm Jan 28, 2019
f3ecba5
Also remove visibility define
wesm Jan 28, 2019
a688a3e
Remove comment
wesm Jan 28, 2019
948ff7d
Do not use instantiate NumericTensor<T> in tensor.cc
wesm Jan 28, 2019
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: 0 additions & 26 deletions cpp/src/arrow/array.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,12 +165,6 @@ PrimitiveArray::PrimitiveArray(const std::shared_ptr<DataType>& type, int64_t le
SetData(ArrayData::Make(type, length, {null_bitmap, data}, null_count, offset));
}

template <typename T>
NumericArray<T>::NumericArray(const std::shared_ptr<ArrayData>& data)
: PrimitiveArray(data) {
DCHECK_EQ(data->type->id(), T::type_id);
}

// ----------------------------------------------------------------------
// BooleanArray

Expand DownExpand Up@@ -987,24 +981,4 @@ std::vector<ArrayVector> RechunkArraysConsistently(

} // namespace internal

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericArray<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<TimestampType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<DoubleType>;

} // namespace arrow
25 changes: 2 additions & 23 deletions cpp/src/arrow/array.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -398,12 +398,12 @@ class ARROW_EXPORT PrimitiveArray : public FlatArray {

/// Concrete Array class for numeric data.
template <typename TYPE>
class ARROW_EXPORT NumericArray : public PrimitiveArray {
class NumericArray : public PrimitiveArray {
public:
using TypeClass = TYPE;
using value_type = typename TypeClass::c_type;

explicit NumericArray(const std::shared_ptr<ArrayData>& data);
explicit NumericArray(const std::shared_ptr<ArrayData>& data) : PrimitiveArray(data) {}

// Only enable this constructor without a type argument for types without additional
// metadata
Expand DownExpand Up@@ -844,27 +844,6 @@ class ARROW_EXPORT DictionaryArray : public Array {
std::shared_ptr<Array> indices_;
};

// ----------------------------------------------------------------------
// extern templates and other details

// Only instantiate these templates once
ARROW_EXTERN_TEMPLATE NumericArray<Int8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<HalfFloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<FloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<DoubleType>;
ARROW_EXTERN_TEMPLATE NumericArray<Date32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Date64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<TimestampType>;

/// \brief Perform any validation checks to determine obvious inconsistencies
/// with the array's internal data
///
Expand Down
24 changes: 12 additions & 12 deletions cpp/src/arrow/sparse_tensor.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -264,18 +264,18 @@ class SparseTensorConverter<TYPE, SparseCSRIndex>
// ----------------------------------------------------------------------
// Instantiate templates

#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt8Type, IndexType>; \
template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt16Type, IndexType>; \
template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt32Type, IndexType>; \
template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt64Type, IndexType>; \
template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int8Type, IndexType>; \
template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int16Type, IndexType>; \
template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int32Type, IndexType>; \
template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int64Type, IndexType>; \
template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<HalfFloatType, IndexType>; \
template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<FloatType, IndexType>; \
template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<DoubleType, IndexType>
#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
template class SparseTensorConverter<UInt8Type, IndexType>; \
template class SparseTensorConverter<UInt16Type, IndexType>; \
template class SparseTensorConverter<UInt32Type, IndexType>; \
template class SparseTensorConverter<UInt64Type, IndexType>; \
template class SparseTensorConverter<Int8Type, IndexType>; \
template class SparseTensorConverter<Int16Type, IndexType>; \
template class SparseTensorConverter<Int32Type, IndexType>; \
template class SparseTensorConverter<Int64Type, IndexType>; \
template class SparseTensorConverter<HalfFloatType, IndexType>; \
template class SparseTensorConverter<FloatType, IndexType>; \
template class SparseTensorConverter<DoubleType, IndexType>

INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);
Expand Down
46 changes: 0 additions & 46 deletions cpp/src/arrow/tensor.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,50 +123,4 @@ Type::type Tensor::type_id() const { return type_->id(); }

bool Tensor::Equals(const Tensor& other) const { return TensorEquals(*this, other); }

// ----------------------------------------------------------------------
// NumericTensor

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
const std::vector<int64_t>& shape)
: NumericTensor(data, shape, {}, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
const std::vector<int64_t>& shape,
const std::vector<int64_t>& strides)
: NumericTensor(data, shape, strides, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
const std::vector<int64_t>& shape,
const std::vector<int64_t>& strides,
const std::vector<std::string>& dim_names)
: Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

template <typename TYPE>
int64_t NumericTensor<TYPE>::CalculateValueOffset(
const std::vector<int64_t>& index) const {
int64_t offset = 0;
for (size_t i = 0; i < index.size(); ++i) {
offset += index[i] * strides_[i];
}
return offset;
}

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<DoubleType>;

} // namespace arrow
28 changes: 19 additions & 9 deletions cpp/src/arrow/tensor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@

#include "arrow/buffer.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/macros.h"
#include "arrow/util/visibility.h"

Expand DownExpand Up@@ -121,22 +122,25 @@ class ARROW_EXPORT Tensor {
};

template <typename TYPE>
class ARROW_EXPORT NumericTensor : public Tensor {
class NumericTensor : public Tensor {
public:
using TypeClass = TYPE;
using value_type = typename TypeClass::c_type;

/// Constructor with non-negative strides and dimension names
NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
const std::vector<int64_t>& strides,
const std::vector<std::string>& dim_names)
: Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

/// Constructor with no dimension names or strides, data assumed to be row-major
NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape);
NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape)
: NumericTensor(data, shape, {}, {}) {}

/// Constructor with non-negative strides
NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
const std::vector<int64_t>& strides);

/// Constructor with non-negative strides and dimension names
NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
const std::vector<int64_t>& strides,
const std::vector<std::string>& dim_names);
const std::vector<int64_t>& strides)
: NumericTensor(data, shape, strides, {}) {}

const value_type& Value(const std::vector<int64_t>& index) const {
int64_t offset = CalculateValueOffset(index);
Expand All@@ -145,7 +149,13 @@ class ARROW_EXPORT NumericTensor : public Tensor {
}

protected:
int64_t CalculateValueOffset(const std::vector<int64_t>& index) const;
int64_t CalculateValueOffset(const std::vector<int64_t>& index) const {
int64_t offset = 0;
for (size_t i = 0; i < index.size(); ++i) {
offset += index[i] * strides_[i];
}
return offset;
}
};

} // namespace arrow
Expand Down
9 changes: 0 additions & 9 deletions cpp/src/arrow/util/visibility.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,15 +43,6 @@
#endif
#endif // Non-Windows

// gcc and clang disagree about how to handle template visibility when you have
// explicit specializations https://llvm.org/bugs/show_bug.cgi?id=24815

#if defined(__clang__)
#define ARROW_EXTERN_TEMPLATE extern template class ARROW_EXPORT
#else
#define ARROW_EXTERN_TEMPLATE extern template class
#endif

// This is a complicated topic, some reading on it:
// http://www.codesynthesis.com/~boris/blog/2010/01/18/dll-export-cxx-templates/
#if defined(_MSC_VER) || defined(__clang__)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>#3509

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

 Closed

wesm
wants to merge
4
commits into

from

 Closed


ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>
#3509
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7ccac89

Do not use extern template class with NumericArray<T>


wesm Jan 28, 2019
f3ecba5

Also remove visibility define


wesm Jan 28, 2019
a688a3e

Remove comment


wesm Jan 28, 2019
948ff7d

Do not use instantiate NumericTensor<T> in tensor.cc


wesm Jan 28, 2019

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: 0 additions & 26 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,12 +165,6 @@ PrimitiveArray::PrimitiveArray(const std::shared_ptr<DataType>& type, int64_t le
 SetData(ArrayData::Make(type, length, {null_bitmap, data}, null_count, offset));
}

template <typename T>
NumericArray<T>::NumericArray(const std::shared_ptr<ArrayData>& data)
 : PrimitiveArray(data) {
 DCHECK_EQ(data->type->id(), T::type_id);
}

// ----------------------------------------------------------------------
// BooleanArray

Expand DownExpand Up@@ -987,24 +981,4 @@ std::vector<ArrayVector> RechunkArraysConsistently(

} // namespace internal

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericArray<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<TimestampType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<DoubleType>;

} // namespace arrow

25 changes: 2 additions & 23 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,12 +398,12 @@ class ARROW_EXPORT PrimitiveArray : public FlatArray {

/// Concrete Array class for numeric data.
template <typename TYPE>
class ARROW_EXPORT NumericArray : public PrimitiveArray {
class NumericArray : public PrimitiveArray {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 explicit NumericArray(const std::shared_ptr<ArrayData>& data);
 explicit NumericArray(const std::shared_ptr<ArrayData>& data) : PrimitiveArray(data) {}

 // Only enable this constructor without a type argument for types without additional
 // metadata
Expand DownExpand Up@@ -844,27 +844,6 @@ class ARROW_EXPORT DictionaryArray : public Array {
 std::shared_ptr<Array> indices_;
};

// ----------------------------------------------------------------------
// extern templates and other details

// Only instantiate these templates once
ARROW_EXTERN_TEMPLATE NumericArray<Int8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<HalfFloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<FloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<DoubleType>;
ARROW_EXTERN_TEMPLATE NumericArray<Date32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Date64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<TimestampType>;

/// \brief Perform any validation checks to determine obvious inconsistencies
/// with the array's internal data
///
Expand Down

24 changes: 12 additions & 12 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,18 +264,18 @@ class SparseTensorConverter<TYPE, SparseCSRIndex>
// ----------------------------------------------------------------------
// Instantiate templates

#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<HalfFloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<FloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<DoubleType, IndexType>
#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class SparseTensorConverter<UInt8Type, IndexType>; \
 template class SparseTensorConverter<UInt16Type, IndexType>; \
 template class SparseTensorConverter<UInt32Type, IndexType>; \
 template class SparseTensorConverter<UInt64Type, IndexType>; \
 template class SparseTensorConverter<Int8Type, IndexType>; \
 template class SparseTensorConverter<Int16Type, IndexType>; \
 template class SparseTensorConverter<Int32Type, IndexType>; \
 template class SparseTensorConverter<Int64Type, IndexType>; \
 template class SparseTensorConverter<HalfFloatType, IndexType>; \
 template class SparseTensorConverter<FloatType, IndexType>; \
 template class SparseTensorConverter<DoubleType, IndexType>

INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);
Expand Down

46 changes: 0 additions & 46 deletions
cpp/src/arrow/tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,50 +123,4 @@ Type::type Tensor::type_id() const { return type_->id(); }

bool Tensor::Equals(const Tensor& other) const { return TensorEquals(*this, other); }

// ----------------------------------------------------------------------
// NumericTensor

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

template <typename TYPE>
int64_t NumericTensor<TYPE>::CalculateValueOffset(
 const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
}

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<DoubleType>;

} // namespace arrow

28 changes: 19 additions & 9 deletions
cpp/src/arrow/tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@

#include "arrow/buffer.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/macros.h"
#include "arrow/util/visibility.h"

Expand DownExpand Up@@ -121,22 +122,25 @@ class ARROW_EXPORT Tensor {
};

template <typename TYPE>
class ARROW_EXPORT NumericTensor : public Tensor {
class NumericTensor : public Tensor {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

 /// Constructor with no dimension names or strides, data assumed to be row-major
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape);
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

 /// Constructor with non-negative strides
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides);

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names);
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

 const value_type& Value(const std::vector<int64_t>& index) const {
 int64_t offset = CalculateValueOffset(index);
Expand All@@ -145,7 +149,13 @@ class ARROW_EXPORT NumericTensor : public Tensor {
 }

 protected:
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const;
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
 }
};

} // namespace arrow
Expand Down

9 changes: 0 additions & 9 deletions
cpp/src/arrow/util/visibility.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,15 +43,6 @@
#endif
#endif // Non-Windows

// gcc and clang disagree about how to handle template visibility when you have
// explicit specializations https://llvm.org/bugs/show_bug.cgi?id=24815

#if defined(__clang__)
#define ARROW_EXTERN_TEMPLATE extern template class ARROW_EXPORT
#else
#define ARROW_EXTERN_TEMPLATE extern template class
#endif

// This is a complicated topic, some reading on it:
// http://www.codesynthesis.com/~boris/blog/2010/01/18/dll-export-cxx-templates/
#if defined(_MSC_VER) || defined(__clang__)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>#3509

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

 Closed

wesm
wants to merge
4
commits into

from

 Closed


ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>
#3509
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7ccac89

Do not use extern template class with NumericArray<T>


wesm Jan 28, 2019
f3ecba5

Also remove visibility define


wesm Jan 28, 2019
a688a3e

Remove comment


wesm Jan 28, 2019
948ff7d

Do not use instantiate NumericTensor<T> in tensor.cc


wesm Jan 28, 2019

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: 0 additions & 26 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,12 +165,6 @@ PrimitiveArray::PrimitiveArray(const std::shared_ptr<DataType>& type, int64_t le
 SetData(ArrayData::Make(type, length, {null_bitmap, data}, null_count, offset));
}

template <typename T>
NumericArray<T>::NumericArray(const std::shared_ptr<ArrayData>& data)
 : PrimitiveArray(data) {
 DCHECK_EQ(data->type->id(), T::type_id);
}

// ----------------------------------------------------------------------
// BooleanArray

Expand DownExpand Up@@ -987,24 +981,4 @@ std::vector<ArrayVector> RechunkArraysConsistently(

} // namespace internal

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericArray<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<TimestampType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<DoubleType>;

} // namespace arrow

25 changes: 2 additions & 23 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,12 +398,12 @@ class ARROW_EXPORT PrimitiveArray : public FlatArray {

/// Concrete Array class for numeric data.
template <typename TYPE>
class ARROW_EXPORT NumericArray : public PrimitiveArray {
class NumericArray : public PrimitiveArray {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 explicit NumericArray(const std::shared_ptr<ArrayData>& data);
 explicit NumericArray(const std::shared_ptr<ArrayData>& data) : PrimitiveArray(data) {}

 // Only enable this constructor without a type argument for types without additional
 // metadata
Expand DownExpand Up@@ -844,27 +844,6 @@ class ARROW_EXPORT DictionaryArray : public Array {
 std::shared_ptr<Array> indices_;
};

// ----------------------------------------------------------------------
// extern templates and other details

// Only instantiate these templates once
ARROW_EXTERN_TEMPLATE NumericArray<Int8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<HalfFloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<FloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<DoubleType>;
ARROW_EXTERN_TEMPLATE NumericArray<Date32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Date64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<TimestampType>;

/// \brief Perform any validation checks to determine obvious inconsistencies
/// with the array's internal data
///
Expand Down

24 changes: 12 additions & 12 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,18 +264,18 @@ class SparseTensorConverter<TYPE, SparseCSRIndex>
// ----------------------------------------------------------------------
// Instantiate templates

#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<HalfFloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<FloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<DoubleType, IndexType>
#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class SparseTensorConverter<UInt8Type, IndexType>; \
 template class SparseTensorConverter<UInt16Type, IndexType>; \
 template class SparseTensorConverter<UInt32Type, IndexType>; \
 template class SparseTensorConverter<UInt64Type, IndexType>; \
 template class SparseTensorConverter<Int8Type, IndexType>; \
 template class SparseTensorConverter<Int16Type, IndexType>; \
 template class SparseTensorConverter<Int32Type, IndexType>; \
 template class SparseTensorConverter<Int64Type, IndexType>; \
 template class SparseTensorConverter<HalfFloatType, IndexType>; \
 template class SparseTensorConverter<FloatType, IndexType>; \
 template class SparseTensorConverter<DoubleType, IndexType>

INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);
Expand Down

46 changes: 0 additions & 46 deletions
cpp/src/arrow/tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,50 +123,4 @@ Type::type Tensor::type_id() const { return type_->id(); }

bool Tensor::Equals(const Tensor& other) const { return TensorEquals(*this, other); }

// ----------------------------------------------------------------------
// NumericTensor

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

template <typename TYPE>
int64_t NumericTensor<TYPE>::CalculateValueOffset(
 const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
}

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<DoubleType>;

} // namespace arrow

28 changes: 19 additions & 9 deletions
cpp/src/arrow/tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@

#include "arrow/buffer.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/macros.h"
#include "arrow/util/visibility.h"

Expand DownExpand Up@@ -121,22 +122,25 @@ class ARROW_EXPORT Tensor {
};

template <typename TYPE>
class ARROW_EXPORT NumericTensor : public Tensor {
class NumericTensor : public Tensor {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

 /// Constructor with no dimension names or strides, data assumed to be row-major
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape);
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

 /// Constructor with non-negative strides
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides);

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names);
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

 const value_type& Value(const std::vector<int64_t>& index) const {
 int64_t offset = CalculateValueOffset(index);
Expand All@@ -145,7 +149,13 @@ class ARROW_EXPORT NumericTensor : public Tensor {
 }

 protected:
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const;
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
 }
};

} // namespace arrow
Expand Down

9 changes: 0 additions & 9 deletions
cpp/src/arrow/util/visibility.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,15 +43,6 @@
#endif
#endif // Non-Windows

// gcc and clang disagree about how to handle template visibility when you have
// explicit specializations https://llvm.org/bugs/show_bug.cgi?id=24815

#if defined(__clang__)
#define ARROW_EXTERN_TEMPLATE extern template class ARROW_EXPORT
#else
#define ARROW_EXTERN_TEMPLATE extern template class
#endif

// This is a complicated topic, some reading on it:
// http://www.codesynthesis.com/~boris/blog/2010/01/18/dll-export-cxx-templates/
#if defined(_MSC_VER) || defined(__clang__)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>#3509

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

 Closed

wesm
wants to merge
4
commits into

from

 Closed


ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>
#3509
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7ccac89

Do not use extern template class with NumericArray<T>


wesm Jan 28, 2019
f3ecba5

Also remove visibility define


wesm Jan 28, 2019
a688a3e

Remove comment


wesm Jan 28, 2019
948ff7d

Do not use instantiate NumericTensor<T> in tensor.cc


wesm Jan 28, 2019

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: 0 additions & 26 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,12 +165,6 @@ PrimitiveArray::PrimitiveArray(const std::shared_ptr<DataType>& type, int64_t le
 SetData(ArrayData::Make(type, length, {null_bitmap, data}, null_count, offset));
}

template <typename T>
NumericArray<T>::NumericArray(const std::shared_ptr<ArrayData>& data)
 : PrimitiveArray(data) {
 DCHECK_EQ(data->type->id(), T::type_id);
}

// ----------------------------------------------------------------------
// BooleanArray

Expand DownExpand Up@@ -987,24 +981,4 @@ std::vector<ArrayVector> RechunkArraysConsistently(

} // namespace internal

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericArray<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<TimestampType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<DoubleType>;

} // namespace arrow

25 changes: 2 additions & 23 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,12 +398,12 @@ class ARROW_EXPORT PrimitiveArray : public FlatArray {

/// Concrete Array class for numeric data.
template <typename TYPE>
class ARROW_EXPORT NumericArray : public PrimitiveArray {
class NumericArray : public PrimitiveArray {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 explicit NumericArray(const std::shared_ptr<ArrayData>& data);
 explicit NumericArray(const std::shared_ptr<ArrayData>& data) : PrimitiveArray(data) {}

 // Only enable this constructor without a type argument for types without additional
 // metadata
Expand DownExpand Up@@ -844,27 +844,6 @@ class ARROW_EXPORT DictionaryArray : public Array {
 std::shared_ptr<Array> indices_;
};

// ----------------------------------------------------------------------
// extern templates and other details

// Only instantiate these templates once
ARROW_EXTERN_TEMPLATE NumericArray<Int8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<HalfFloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<FloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<DoubleType>;
ARROW_EXTERN_TEMPLATE NumericArray<Date32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Date64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<TimestampType>;

/// \brief Perform any validation checks to determine obvious inconsistencies
/// with the array's internal data
///
Expand Down

24 changes: 12 additions & 12 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,18 +264,18 @@ class SparseTensorConverter<TYPE, SparseCSRIndex>
// ----------------------------------------------------------------------
// Instantiate templates

#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<HalfFloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<FloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<DoubleType, IndexType>
#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class SparseTensorConverter<UInt8Type, IndexType>; \
 template class SparseTensorConverter<UInt16Type, IndexType>; \
 template class SparseTensorConverter<UInt32Type, IndexType>; \
 template class SparseTensorConverter<UInt64Type, IndexType>; \
 template class SparseTensorConverter<Int8Type, IndexType>; \
 template class SparseTensorConverter<Int16Type, IndexType>; \
 template class SparseTensorConverter<Int32Type, IndexType>; \
 template class SparseTensorConverter<Int64Type, IndexType>; \
 template class SparseTensorConverter<HalfFloatType, IndexType>; \
 template class SparseTensorConverter<FloatType, IndexType>; \
 template class SparseTensorConverter<DoubleType, IndexType>

INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);
Expand Down

46 changes: 0 additions & 46 deletions
cpp/src/arrow/tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,50 +123,4 @@ Type::type Tensor::type_id() const { return type_->id(); }

bool Tensor::Equals(const Tensor& other) const { return TensorEquals(*this, other); }

// ----------------------------------------------------------------------
// NumericTensor

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

template <typename TYPE>
int64_t NumericTensor<TYPE>::CalculateValueOffset(
 const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
}

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<DoubleType>;

} // namespace arrow

28 changes: 19 additions & 9 deletions
cpp/src/arrow/tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@

#include "arrow/buffer.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/macros.h"
#include "arrow/util/visibility.h"

Expand DownExpand Up@@ -121,22 +122,25 @@ class ARROW_EXPORT Tensor {
};

template <typename TYPE>
class ARROW_EXPORT NumericTensor : public Tensor {
class NumericTensor : public Tensor {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

 /// Constructor with no dimension names or strides, data assumed to be row-major
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape);
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

 /// Constructor with non-negative strides
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides);

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names);
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

 const value_type& Value(const std::vector<int64_t>& index) const {
 int64_t offset = CalculateValueOffset(index);
Expand All@@ -145,7 +149,13 @@ class ARROW_EXPORT NumericTensor : public Tensor {
 }

 protected:
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const;
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
 }
};

} // namespace arrow
Expand Down

9 changes: 0 additions & 9 deletions
cpp/src/arrow/util/visibility.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,15 +43,6 @@
#endif
#endif // Non-Windows

// gcc and clang disagree about how to handle template visibility when you have
// explicit specializations https://llvm.org/bugs/show_bug.cgi?id=24815

#if defined(__clang__)
#define ARROW_EXTERN_TEMPLATE extern template class ARROW_EXPORT
#else
#define ARROW_EXTERN_TEMPLATE extern template class
#endif

// This is a complicated topic, some reading on it:
// http://www.codesynthesis.com/~boris/blog/2010/01/18/dll-export-cxx-templates/
#if defined(_MSC_VER) || defined(__clang__)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>#3509

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

 Closed

wesm
wants to merge
4
commits into

from

 Closed


ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>
#3509
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7ccac89

Do not use extern template class with NumericArray<T>


wesm Jan 28, 2019
f3ecba5

Also remove visibility define


wesm Jan 28, 2019
a688a3e

Remove comment


wesm Jan 28, 2019
948ff7d

Do not use instantiate NumericTensor<T> in tensor.cc


wesm Jan 28, 2019

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: 0 additions & 26 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,12 +165,6 @@ PrimitiveArray::PrimitiveArray(const std::shared_ptr<DataType>& type, int64_t le
 SetData(ArrayData::Make(type, length, {null_bitmap, data}, null_count, offset));
}

template <typename T>
NumericArray<T>::NumericArray(const std::shared_ptr<ArrayData>& data)
 : PrimitiveArray(data) {
 DCHECK_EQ(data->type->id(), T::type_id);
}

// ----------------------------------------------------------------------
// BooleanArray

Expand DownExpand Up@@ -987,24 +981,4 @@ std::vector<ArrayVector> RechunkArraysConsistently(

} // namespace internal

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericArray<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<TimestampType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<DoubleType>;

} // namespace arrow

25 changes: 2 additions & 23 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,12 +398,12 @@ class ARROW_EXPORT PrimitiveArray : public FlatArray {

/// Concrete Array class for numeric data.
template <typename TYPE>
class ARROW_EXPORT NumericArray : public PrimitiveArray {
class NumericArray : public PrimitiveArray {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 explicit NumericArray(const std::shared_ptr<ArrayData>& data);
 explicit NumericArray(const std::shared_ptr<ArrayData>& data) : PrimitiveArray(data) {}

 // Only enable this constructor without a type argument for types without additional
 // metadata
Expand DownExpand Up@@ -844,27 +844,6 @@ class ARROW_EXPORT DictionaryArray : public Array {
 std::shared_ptr<Array> indices_;
};

// ----------------------------------------------------------------------
// extern templates and other details

// Only instantiate these templates once
ARROW_EXTERN_TEMPLATE NumericArray<Int8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<HalfFloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<FloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<DoubleType>;
ARROW_EXTERN_TEMPLATE NumericArray<Date32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Date64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<TimestampType>;

/// \brief Perform any validation checks to determine obvious inconsistencies
/// with the array's internal data
///
Expand Down

24 changes: 12 additions & 12 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,18 +264,18 @@ class SparseTensorConverter<TYPE, SparseCSRIndex>
// ----------------------------------------------------------------------
// Instantiate templates

#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<HalfFloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<FloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<DoubleType, IndexType>
#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class SparseTensorConverter<UInt8Type, IndexType>; \
 template class SparseTensorConverter<UInt16Type, IndexType>; \
 template class SparseTensorConverter<UInt32Type, IndexType>; \
 template class SparseTensorConverter<UInt64Type, IndexType>; \
 template class SparseTensorConverter<Int8Type, IndexType>; \
 template class SparseTensorConverter<Int16Type, IndexType>; \
 template class SparseTensorConverter<Int32Type, IndexType>; \
 template class SparseTensorConverter<Int64Type, IndexType>; \
 template class SparseTensorConverter<HalfFloatType, IndexType>; \
 template class SparseTensorConverter<FloatType, IndexType>; \
 template class SparseTensorConverter<DoubleType, IndexType>

INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);
Expand Down

46 changes: 0 additions & 46 deletions
cpp/src/arrow/tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,50 +123,4 @@ Type::type Tensor::type_id() const { return type_->id(); }

bool Tensor::Equals(const Tensor& other) const { return TensorEquals(*this, other); }

// ----------------------------------------------------------------------
// NumericTensor

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

template <typename TYPE>
int64_t NumericTensor<TYPE>::CalculateValueOffset(
 const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
}

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<DoubleType>;

} // namespace arrow

28 changes: 19 additions & 9 deletions
cpp/src/arrow/tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@

#include "arrow/buffer.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/macros.h"
#include "arrow/util/visibility.h"

Expand DownExpand Up@@ -121,22 +122,25 @@ class ARROW_EXPORT Tensor {
};

template <typename TYPE>
class ARROW_EXPORT NumericTensor : public Tensor {
class NumericTensor : public Tensor {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

 /// Constructor with no dimension names or strides, data assumed to be row-major
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape);
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

 /// Constructor with non-negative strides
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides);

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names);
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

 const value_type& Value(const std::vector<int64_t>& index) const {
 int64_t offset = CalculateValueOffset(index);
Expand All@@ -145,7 +149,13 @@ class ARROW_EXPORT NumericTensor : public Tensor {
 }

 protected:
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const;
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
 }
};

} // namespace arrow
Expand Down

9 changes: 0 additions & 9 deletions
cpp/src/arrow/util/visibility.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,15 +43,6 @@
#endif
#endif // Non-Windows

// gcc and clang disagree about how to handle template visibility when you have
// explicit specializations https://llvm.org/bugs/show_bug.cgi?id=24815

#if defined(__clang__)
#define ARROW_EXTERN_TEMPLATE extern template class ARROW_EXPORT
#else
#define ARROW_EXTERN_TEMPLATE extern template class
#endif

// This is a complicated topic, some reading on it:
// http://www.codesynthesis.com/~boris/blog/2010/01/18/dll-export-cxx-templates/
#if defined(_MSC_VER) || defined(__clang__)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>#3509

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

 Closed

wesm
wants to merge
4
commits into

from

 Closed


ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>
#3509
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7ccac89

Do not use extern template class with NumericArray<T>


wesm Jan 28, 2019
f3ecba5

Also remove visibility define


wesm Jan 28, 2019
a688a3e

Remove comment


wesm Jan 28, 2019
948ff7d

Do not use instantiate NumericTensor<T> in tensor.cc


wesm Jan 28, 2019

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: 0 additions & 26 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,12 +165,6 @@ PrimitiveArray::PrimitiveArray(const std::shared_ptr<DataType>& type, int64_t le
 SetData(ArrayData::Make(type, length, {null_bitmap, data}, null_count, offset));
}

template <typename T>
NumericArray<T>::NumericArray(const std::shared_ptr<ArrayData>& data)
 : PrimitiveArray(data) {
 DCHECK_EQ(data->type->id(), T::type_id);
}

// ----------------------------------------------------------------------
// BooleanArray

Expand DownExpand Up@@ -987,24 +981,4 @@ std::vector<ArrayVector> RechunkArraysConsistently(

} // namespace internal

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericArray<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<TimestampType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<DoubleType>;

} // namespace arrow

25 changes: 2 additions & 23 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,12 +398,12 @@ class ARROW_EXPORT PrimitiveArray : public FlatArray {

/// Concrete Array class for numeric data.
template <typename TYPE>
class ARROW_EXPORT NumericArray : public PrimitiveArray {
class NumericArray : public PrimitiveArray {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 explicit NumericArray(const std::shared_ptr<ArrayData>& data);
 explicit NumericArray(const std::shared_ptr<ArrayData>& data) : PrimitiveArray(data) {}

 // Only enable this constructor without a type argument for types without additional
 // metadata
Expand DownExpand Up@@ -844,27 +844,6 @@ class ARROW_EXPORT DictionaryArray : public Array {
 std::shared_ptr<Array> indices_;
};

// ----------------------------------------------------------------------
// extern templates and other details

// Only instantiate these templates once
ARROW_EXTERN_TEMPLATE NumericArray<Int8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<HalfFloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<FloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<DoubleType>;
ARROW_EXTERN_TEMPLATE NumericArray<Date32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Date64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<TimestampType>;

/// \brief Perform any validation checks to determine obvious inconsistencies
/// with the array's internal data
///
Expand Down

24 changes: 12 additions & 12 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,18 +264,18 @@ class SparseTensorConverter<TYPE, SparseCSRIndex>
// ----------------------------------------------------------------------
// Instantiate templates

#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<HalfFloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<FloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<DoubleType, IndexType>
#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class SparseTensorConverter<UInt8Type, IndexType>; \
 template class SparseTensorConverter<UInt16Type, IndexType>; \
 template class SparseTensorConverter<UInt32Type, IndexType>; \
 template class SparseTensorConverter<UInt64Type, IndexType>; \
 template class SparseTensorConverter<Int8Type, IndexType>; \
 template class SparseTensorConverter<Int16Type, IndexType>; \
 template class SparseTensorConverter<Int32Type, IndexType>; \
 template class SparseTensorConverter<Int64Type, IndexType>; \
 template class SparseTensorConverter<HalfFloatType, IndexType>; \
 template class SparseTensorConverter<FloatType, IndexType>; \
 template class SparseTensorConverter<DoubleType, IndexType>

INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);
Expand Down

46 changes: 0 additions & 46 deletions
cpp/src/arrow/tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,50 +123,4 @@ Type::type Tensor::type_id() const { return type_->id(); }

bool Tensor::Equals(const Tensor& other) const { return TensorEquals(*this, other); }

// ----------------------------------------------------------------------
// NumericTensor

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

template <typename TYPE>
int64_t NumericTensor<TYPE>::CalculateValueOffset(
 const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
}

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<DoubleType>;

} // namespace arrow

28 changes: 19 additions & 9 deletions
cpp/src/arrow/tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@

#include "arrow/buffer.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/macros.h"
#include "arrow/util/visibility.h"

Expand DownExpand Up@@ -121,22 +122,25 @@ class ARROW_EXPORT Tensor {
};

template <typename TYPE>
class ARROW_EXPORT NumericTensor : public Tensor {
class NumericTensor : public Tensor {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

 /// Constructor with no dimension names or strides, data assumed to be row-major
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape);
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

 /// Constructor with non-negative strides
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides);

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names);
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

 const value_type& Value(const std::vector<int64_t>& index) const {
 int64_t offset = CalculateValueOffset(index);
Expand All@@ -145,7 +149,13 @@ class ARROW_EXPORT NumericTensor : public Tensor {
 }

 protected:
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const;
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
 }
};

} // namespace arrow
Expand Down

9 changes: 0 additions & 9 deletions
cpp/src/arrow/util/visibility.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,15 +43,6 @@
#endif
#endif // Non-Windows

// gcc and clang disagree about how to handle template visibility when you have
// explicit specializations https://llvm.org/bugs/show_bug.cgi?id=24815

#if defined(__clang__)
#define ARROW_EXTERN_TEMPLATE extern template class ARROW_EXPORT
#else
#define ARROW_EXTERN_TEMPLATE extern template class
#endif

// This is a complicated topic, some reading on it:
// http://www.codesynthesis.com/~boris/blog/2010/01/18/dll-export-cxx-templates/
#if defined(_MSC_VER) || defined(__clang__)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>#3509

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

 Closed

wesm
wants to merge
4
commits into

from

 Closed


ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>
#3509
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7ccac89

Do not use extern template class with NumericArray<T>


wesm Jan 28, 2019
f3ecba5

Also remove visibility define


wesm Jan 28, 2019
a688a3e

Remove comment


wesm Jan 28, 2019
948ff7d

Do not use instantiate NumericTensor<T> in tensor.cc


wesm Jan 28, 2019

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: 0 additions & 26 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,12 +165,6 @@ PrimitiveArray::PrimitiveArray(const std::shared_ptr<DataType>& type, int64_t le
 SetData(ArrayData::Make(type, length, {null_bitmap, data}, null_count, offset));
}

template <typename T>
NumericArray<T>::NumericArray(const std::shared_ptr<ArrayData>& data)
 : PrimitiveArray(data) {
 DCHECK_EQ(data->type->id(), T::type_id);
}

// ----------------------------------------------------------------------
// BooleanArray

Expand DownExpand Up@@ -987,24 +981,4 @@ std::vector<ArrayVector> RechunkArraysConsistently(

} // namespace internal

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericArray<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<TimestampType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<DoubleType>;

} // namespace arrow

25 changes: 2 additions & 23 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,12 +398,12 @@ class ARROW_EXPORT PrimitiveArray : public FlatArray {

/// Concrete Array class for numeric data.
template <typename TYPE>
class ARROW_EXPORT NumericArray : public PrimitiveArray {
class NumericArray : public PrimitiveArray {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 explicit NumericArray(const std::shared_ptr<ArrayData>& data);
 explicit NumericArray(const std::shared_ptr<ArrayData>& data) : PrimitiveArray(data) {}

 // Only enable this constructor without a type argument for types without additional
 // metadata
Expand DownExpand Up@@ -844,27 +844,6 @@ class ARROW_EXPORT DictionaryArray : public Array {
 std::shared_ptr<Array> indices_;
};

// ----------------------------------------------------------------------
// extern templates and other details

// Only instantiate these templates once
ARROW_EXTERN_TEMPLATE NumericArray<Int8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<HalfFloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<FloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<DoubleType>;
ARROW_EXTERN_TEMPLATE NumericArray<Date32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Date64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<TimestampType>;

/// \brief Perform any validation checks to determine obvious inconsistencies
/// with the array's internal data
///
Expand Down

24 changes: 12 additions & 12 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,18 +264,18 @@ class SparseTensorConverter<TYPE, SparseCSRIndex>
// ----------------------------------------------------------------------
// Instantiate templates

#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<HalfFloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<FloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<DoubleType, IndexType>
#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class SparseTensorConverter<UInt8Type, IndexType>; \
 template class SparseTensorConverter<UInt16Type, IndexType>; \
 template class SparseTensorConverter<UInt32Type, IndexType>; \
 template class SparseTensorConverter<UInt64Type, IndexType>; \
 template class SparseTensorConverter<Int8Type, IndexType>; \
 template class SparseTensorConverter<Int16Type, IndexType>; \
 template class SparseTensorConverter<Int32Type, IndexType>; \
 template class SparseTensorConverter<Int64Type, IndexType>; \
 template class SparseTensorConverter<HalfFloatType, IndexType>; \
 template class SparseTensorConverter<FloatType, IndexType>; \
 template class SparseTensorConverter<DoubleType, IndexType>

INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);
Expand Down

46 changes: 0 additions & 46 deletions
cpp/src/arrow/tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,50 +123,4 @@ Type::type Tensor::type_id() const { return type_->id(); }

bool Tensor::Equals(const Tensor& other) const { return TensorEquals(*this, other); }

// ----------------------------------------------------------------------
// NumericTensor

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

template <typename TYPE>
int64_t NumericTensor<TYPE>::CalculateValueOffset(
 const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
}

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<DoubleType>;

} // namespace arrow

28 changes: 19 additions & 9 deletions
cpp/src/arrow/tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@

#include "arrow/buffer.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/macros.h"
#include "arrow/util/visibility.h"

Expand DownExpand Up@@ -121,22 +122,25 @@ class ARROW_EXPORT Tensor {
};

template <typename TYPE>
class ARROW_EXPORT NumericTensor : public Tensor {
class NumericTensor : public Tensor {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

 /// Constructor with no dimension names or strides, data assumed to be row-major
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape);
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

 /// Constructor with non-negative strides
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides);

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names);
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

 const value_type& Value(const std::vector<int64_t>& index) const {
 int64_t offset = CalculateValueOffset(index);
Expand All@@ -145,7 +149,13 @@ class ARROW_EXPORT NumericTensor : public Tensor {
 }

 protected:
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const;
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
 }
};

} // namespace arrow
Expand Down

9 changes: 0 additions & 9 deletions
cpp/src/arrow/util/visibility.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,15 +43,6 @@
#endif
#endif // Non-Windows

// gcc and clang disagree about how to handle template visibility when you have
// explicit specializations https://llvm.org/bugs/show_bug.cgi?id=24815

#if defined(__clang__)
#define ARROW_EXTERN_TEMPLATE extern template class ARROW_EXPORT
#else
#define ARROW_EXTERN_TEMPLATE extern template class
#endif

// This is a complicated topic, some reading on it:
// http://www.codesynthesis.com/~boris/blog/2010/01/18/dll-export-cxx-templates/
#if defined(_MSC_VER) || defined(__clang__)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>#3509

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

 Closed

wesm
wants to merge
4
commits into

from

 Closed


ARROW-4399: [C++] Do not use extern template class with NumericArray<T> and NumericTensor<T>
#3509
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7ccac89

Do not use extern template class with NumericArray<T>


wesm Jan 28, 2019
f3ecba5

Also remove visibility define


wesm Jan 28, 2019
a688a3e

Remove comment


wesm Jan 28, 2019
948ff7d

Do not use instantiate NumericTensor<T> in tensor.cc


wesm Jan 28, 2019

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: 0 additions & 26 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,12 +165,6 @@ PrimitiveArray::PrimitiveArray(const std::shared_ptr<DataType>& type, int64_t le
 SetData(ArrayData::Make(type, length, {null_bitmap, data}, null_count, offset));
}

template <typename T>
NumericArray<T>::NumericArray(const std::shared_ptr<ArrayData>& data)
 : PrimitiveArray(data) {
 DCHECK_EQ(data->type->id(), T::type_id);
}

// ----------------------------------------------------------------------
// BooleanArray

Expand DownExpand Up@@ -987,24 +981,4 @@ std::vector<ArrayVector> RechunkArraysConsistently(

} // namespace internal

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericArray<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<TimestampType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Date64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time32Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<Time64Type>;
template class ARROW_TEMPLATE_EXPORT NumericArray<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericArray<DoubleType>;

} // namespace arrow

25 changes: 2 additions & 23 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,12 +398,12 @@ class ARROW_EXPORT PrimitiveArray : public FlatArray {

/// Concrete Array class for numeric data.
template <typename TYPE>
class ARROW_EXPORT NumericArray : public PrimitiveArray {
class NumericArray : public PrimitiveArray {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 explicit NumericArray(const std::shared_ptr<ArrayData>& data);
 explicit NumericArray(const std::shared_ptr<ArrayData>& data) : PrimitiveArray(data) {}

 // Only enable this constructor without a type argument for types without additional
 // metadata
Expand DownExpand Up@@ -844,27 +844,6 @@ class ARROW_EXPORT DictionaryArray : public Array {
 std::shared_ptr<Array> indices_;
};

// ----------------------------------------------------------------------
// extern templates and other details

// Only instantiate these templates once
ARROW_EXTERN_TEMPLATE NumericArray<Int8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt8Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt16Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Int64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<UInt64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<HalfFloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<FloatType>;
ARROW_EXTERN_TEMPLATE NumericArray<DoubleType>;
ARROW_EXTERN_TEMPLATE NumericArray<Date32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Date64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time32Type>;
ARROW_EXTERN_TEMPLATE NumericArray<Time64Type>;
ARROW_EXTERN_TEMPLATE NumericArray<TimestampType>;

/// \brief Perform any validation checks to determine obvious inconsistencies
/// with the array's internal data
///
Expand Down

24 changes: 12 additions & 12 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,18 +264,18 @@ class SparseTensorConverter<TYPE, SparseCSRIndex>
// ----------------------------------------------------------------------
// Instantiate templates

#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<UInt64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int8Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int16Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int32Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<Int64Type, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<HalfFloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<FloatType, IndexType>; \
 template class ARROW_TEMPLATE_EXPORT SparseTensorConverter<DoubleType, IndexType>
#define INSTANTIATE_SPARSE_TENSOR_CONVERTER(IndexType) \
 template class SparseTensorConverter<UInt8Type, IndexType>; \
 template class SparseTensorConverter<UInt16Type, IndexType>; \
 template class SparseTensorConverter<UInt32Type, IndexType>; \
 template class SparseTensorConverter<UInt64Type, IndexType>; \
 template class SparseTensorConverter<Int8Type, IndexType>; \
 template class SparseTensorConverter<Int16Type, IndexType>; \
 template class SparseTensorConverter<Int32Type, IndexType>; \
 template class SparseTensorConverter<Int64Type, IndexType>; \
 template class SparseTensorConverter<HalfFloatType, IndexType>; \
 template class SparseTensorConverter<FloatType, IndexType>; \
 template class SparseTensorConverter<DoubleType, IndexType>

INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);
Expand Down

46 changes: 0 additions & 46 deletions
cpp/src/arrow/tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,50 +123,4 @@ Type::type Tensor::type_id() const { return type_->id(); }

bool Tensor::Equals(const Tensor& other) const { return TensorEquals(*this, other); }

// ----------------------------------------------------------------------
// NumericTensor

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

template <typename TYPE>
NumericTensor<TYPE>::NumericTensor(const std::shared_ptr<Buffer>& data,
 const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

template <typename TYPE>
int64_t NumericTensor<TYPE>::CalculateValueOffset(
 const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
}

// ----------------------------------------------------------------------
// Instantiate templates

template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<UInt64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int8Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int16Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int32Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<Int64Type>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<HalfFloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<FloatType>;
template class ARROW_TEMPLATE_EXPORT NumericTensor<DoubleType>;

} // namespace arrow

28 changes: 19 additions & 9 deletions
cpp/src/arrow/tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@

#include "arrow/buffer.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/macros.h"
#include "arrow/util/visibility.h"

Expand DownExpand Up@@ -121,22 +122,25 @@ class ARROW_EXPORT Tensor {
};

template <typename TYPE>
class ARROW_EXPORT NumericTensor : public Tensor {
class NumericTensor : public Tensor {
 public:
 using TypeClass = TYPE;
 using value_type = typename TypeClass::c_type;

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names)
 : Tensor(TypeTraits<TYPE>::type_singleton(), data, shape, strides, dim_names) {}

 /// Constructor with no dimension names or strides, data assumed to be row-major
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape);
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape)
 : NumericTensor(data, shape, {}, {}) {}

 /// Constructor with non-negative strides
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides);

 /// Constructor with non-negative strides and dimension names
 NumericTensor(const std::shared_ptr<Buffer>& data, const std::vector<int64_t>& shape,
 const std::vector<int64_t>& strides,
 const std::vector<std::string>& dim_names);
 const std::vector<int64_t>& strides)
 : NumericTensor(data, shape, strides, {}) {}

 const value_type& Value(const std::vector<int64_t>& index) const {
 int64_t offset = CalculateValueOffset(index);
Expand All@@ -145,7 +149,13 @@ class ARROW_EXPORT NumericTensor : public Tensor {
 }

 protected:
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const;
 int64_t CalculateValueOffset(const std::vector<int64_t>& index) const {
 int64_t offset = 0;
 for (size_t i = 0; i < index.size(); ++i) {
 offset += index[i] * strides_[i];
 }
 return offset;
 }
};

} // namespace arrow
Expand Down

9 changes: 0 additions & 9 deletions
cpp/src/arrow/util/visibility.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,15 +43,6 @@
#endif
#endif // Non-Windows

// gcc and clang disagree about how to handle template visibility when you have
// explicit specializations https://llvm.org/bugs/show_bug.cgi?id=24815

#if defined(__clang__)
#define ARROW_EXTERN_TEMPLATE extern template class ARROW_EXPORT
#else
#define ARROW_EXTERN_TEMPLATE extern template class
#endif

// This is a complicated topic, some reading on it:
// http://www.codesynthesis.com/~boris/blog/2010/01/18/dll-export-cxx-templates/
#if defined(_MSC_VER) || defined(__clang__)
Expand Down