ARROW-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl#4670

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
mrkn wants to merge 4 commits into from
Closed

ARROW-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl #4670

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
6a14b96
Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl
mrkn Jun 24, 2019
5a6468f
Replace nullptr with NULLPTR
mrkn Jun 25, 2019
819cce5
Remove ARROW_EXPORT from SparseTensorImpl
mrkn Jun 25, 2019
a24f78c
Code review feedback
wesm Jun 26, 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
202 changes: 81 additions & 121 deletions cpp/src/arrow/sparse_tensor.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -135,18 +135,6 @@ class SparseTensorConverter<TYPE, SparseCOOIndex>
using BaseClass::tensor_;
};

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
std::shared_ptr<SparseIndex>* sparse_index,
std::shared_ptr<Buffer>* data) {
NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
Status s = converter.Convert();
DCHECK_OK(s);
*sparse_index = converter.sparse_index;
*data = converter.data;
}

// ----------------------------------------------------------------------
// SparseTensorConverter for SparseCSRIndex

Expand DownExpand Up@@ -244,6 +232,87 @@ INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);

} // namespace

namespace internal {

namespace {

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
std::shared_ptr<SparseIndex>* sparse_index,
std::shared_ptr<Buffer>* data) {
NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
ARROW_CHECK_OK(converter.Convert());
*sparse_index = converter.sparse_index;
*data = converter.data;
}

template <typename SparseIndexType>
inline void MakeSparseTensorFromTensor(const Tensor& tensor,
std::shared_ptr<SparseIndex>* sparse_index,
std::shared_ptr<Buffer>* data) {
switch (tensor.type()->id()) {
case Type::UINT8:
MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, sparse_index, data);
break;
case Type::INT8:
MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, sparse_index, data);
break;
case Type::UINT16:
MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, sparse_index, data);
break;
case Type::INT16:
MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, sparse_index, data);
break;
case Type::UINT32:
MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, sparse_index, data);
break;
case Type::INT32:
MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, sparse_index, data);
break;
case Type::UINT64:
MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, sparse_index, data);
break;
case Type::INT64:
MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, sparse_index, data);
break;
case Type::HALF_FLOAT:
MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, sparse_index,
data);
break;
case Type::FLOAT:
MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, sparse_index, data);
break;
case Type::DOUBLE:
MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, sparse_index, data);
break;
default:
ARROW_LOG(FATAL) << "Unsupported Tensor value type";
break;
}
}

} // namespace

void MakeSparseTensorFromTensor(const Tensor& tensor,
SparseTensorFormat::type sparse_format_id,
std::shared_ptr<SparseIndex>* sparse_index,
std::shared_ptr<Buffer>* data) {
switch (sparse_format_id) {
case SparseTensorFormat::COO:
MakeSparseTensorFromTensor<SparseCOOIndex>(tensor, sparse_index, data);
break;
case SparseTensorFormat::CSR:
MakeSparseTensorFromTensor<SparseCSRIndex>(tensor, sparse_index, data);
break;
default:
ARROW_LOG(FATAL) << "Invalid sparse tensor format ID";
break;
}
}

} // namespace internal

// ----------------------------------------------------------------------
// SparseCOOIndex

Expand DownExpand Up@@ -303,113 +372,4 @@ bool SparseTensor::Equals(const SparseTensor& other) const {
return SparseTensorEquals(*this, other);
}

// ----------------------------------------------------------------------
// SparseTensorImpl

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(
const std::shared_ptr<DataType>& type, const std::vector<int64_t>& shape,
const std::vector<std::string>& dim_names)
: SparseTensorImpl(nullptr, type, nullptr, shape, dim_names) {}

// Constructor with a dense tensor
template <typename SparseIndexType>
template <typename TYPE>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const NumericTensor<TYPE>& tensor)
: SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
tensor.dim_names_) {
SparseTensorConverter<TYPE, SparseIndexType> converter(tensor);
Status s = converter.Convert();
DCHECK_OK(s);
sparse_index_ = converter.sparse_index;
data_ = converter.data;
}

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const Tensor& tensor)
: SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
tensor.dim_names_) {
switch (tensor.type()->id()) {
case Type::UINT8:
MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, &sparse_index_,
&data_);
return;
case Type::INT8:
MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, &sparse_index_,
&data_);
return;
case Type::UINT16:
MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, &sparse_index_,
&data_);
return;
case Type::INT16:
MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, &sparse_index_,
&data_);
return;
case Type::UINT32:
MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, &sparse_index_,
&data_);
return;
case Type::INT32:
MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, &sparse_index_,
&data_);
return;
case Type::UINT64:
MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, &sparse_index_,
&data_);
return;
case Type::INT64:
MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, &sparse_index_,
&data_);
return;
case Type::HALF_FLOAT:
MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, &sparse_index_,
&data_);
return;
case Type::FLOAT:
MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, &sparse_index_,
&data_);
return;
case Type::DOUBLE:
MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, &sparse_index_,
&data_);
return;
default:
break;
}
}

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

#define INSTANTIATE_SPARSE_TENSOR(IndexType) \
template class ARROW_TEMPLATE_EXPORT SparseTensorImpl<IndexType>; \
Comment thread
pitrou marked this conversation as resolved.
Outdated
template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
const NumericTensor<UInt8Type>&); \
template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
const NumericTensor<UInt16Type>&); \
template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
const NumericTensor<UInt32Type>&); \
template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
const NumericTensor<UInt64Type>&); \
template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
const NumericTensor<Int8Type>&); \
template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
const NumericTensor<Int16Type>&); \
template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
const NumericTensor<Int32Type>&); \
template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
const NumericTensor<Int64Type>&); \
template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
const NumericTensor<HalfFloatType>&); \
template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
const NumericTensor<FloatType>&); \
template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
const NumericTensor<DoubleType>&)

INSTANTIATE_SPARSE_TENSOR(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR(SparseCSRIndex);

} // namespace arrow
26 changes: 19 additions & 7 deletions cpp/src/arrow/sparse_tensor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,10 +217,20 @@ class ARROW_EXPORT SparseTensor {
// ----------------------------------------------------------------------
// SparseTensorImpl class

namespace internal {

ARROW_EXPORT
void MakeSparseTensorFromTensor(const Tensor& tensor,
SparseTensorFormat::type sparse_format_id,
std::shared_ptr<SparseIndex>* sparse_index,
std::shared_ptr<Buffer>* data);

} // namespace internal

/// \brief EXPERIMENTAL: Concrete sparse tensor implementation classes with sparse index
/// type
template <typename SparseIndexType>
class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
class SparseTensorImpl : public SparseTensor {
public:
virtual ~SparseTensorImpl() = default;

Expand All@@ -234,14 +244,16 @@ class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
// Constructor for empty sparse tensor
SparseTensorImpl(const std::shared_ptr<DataType>& type,
const std::vector<int64_t>& shape,
const std::vector<std::string>& dim_names = {});

// Constructor with a dense numeric tensor
template <typename TYPE>
explicit SparseTensorImpl(const NumericTensor<TYPE>& tensor);
const std::vector<std::string>& dim_names = {})
: SparseTensorImpl(NULLPTR, type, NULLPTR, shape, dim_names) {}

// Constructor with a dense tensor
explicit SparseTensorImpl(const Tensor& tensor);
explicit SparseTensorImpl(const Tensor& tensor)
: SparseTensorImpl(NULLPTR, tensor.type(), NULLPTR, tensor.shape(),
tensor.dim_names_) {
internal::MakeSparseTensorFromTensor(tensor, SparseIndexType::format_id,
&sparse_index_, &data_);
}

private:
ARROW_DISALLOW_COPY_AND_ASSIGN(SparseTensorImpl);
Expand Down
10 changes: 0 additions & 10 deletions cpp/src/arrow/util/visibility.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,4 @@
#endif
#endif // Non-Windows

// 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__)
#define ARROW_TEMPLATE_CLASS_EXPORT
#define ARROW_TEMPLATE_EXPORT ARROW_EXPORT
#else
#define ARROW_TEMPLATE_CLASS_EXPORT ARROW_EXPORT
#define ARROW_TEMPLATE_EXPORT
#endif

#endif // ARROW_UTIL_VISIBILITY_H
, '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-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl#4670

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

mrkn
wants to merge
4
commits into

from

 Closed


ARROW-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl
#4670
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
6a14b96

Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl


mrkn Jun 24, 2019
5a6468f

Replace nullptr with NULLPTR


mrkn Jun 25, 2019
819cce5

Remove ARROW_EXPORT from SparseTensorImpl


mrkn Jun 25, 2019
a24f78c

Code review feedback


wesm Jun 26, 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


202 changes: 81 additions & 121 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,18 +135,6 @@ class SparseTensorConverter<TYPE, SparseCOOIndex>
 using BaseClass::tensor_;
};

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

// ----------------------------------------------------------------------
// SparseTensorConverter for SparseCSRIndex

Expand DownExpand Up@@ -244,6 +232,87 @@ INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);

} // namespace

namespace internal {

namespace {

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 ARROW_CHECK_OK(converter.Convert());
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

template <typename SparseIndexType>
inline void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, sparse_index,
 data);
 break;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Unsupported Tensor value type";
 break;
 }
}

} // namespace

void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (sparse_format_id) {
 case SparseTensorFormat::COO:
 MakeSparseTensorFromTensor<SparseCOOIndex>(tensor, sparse_index, data);
 break;
 case SparseTensorFormat::CSR:
 MakeSparseTensorFromTensor<SparseCSRIndex>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Invalid sparse tensor format ID";
 break;
 }
}

} // namespace internal

// ----------------------------------------------------------------------
// SparseCOOIndex

Expand DownExpand Up@@ -303,113 +372,4 @@ bool SparseTensor::Equals(const SparseTensor& other) const {
 return SparseTensorEquals(*this, other);
}

// ----------------------------------------------------------------------
// SparseTensorImpl

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(
 const std::shared_ptr<DataType>& type, const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names)
 : SparseTensorImpl(nullptr, type, nullptr, shape, dim_names) {}

// Constructor with a dense tensor
template <typename SparseIndexType>
template <typename TYPE>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const NumericTensor<TYPE>& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 SparseTensorConverter<TYPE, SparseIndexType> converter(tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 sparse_index_ = converter.sparse_index;
 data_ = converter.data;
}

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 default:
 break;
 }
}

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

#define INSTANTIATE_SPARSE_TENSOR(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorImpl<IndexType>; \
Comment thread
pitrou marked this conversation as resolved.


Outdated

 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<HalfFloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<FloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<DoubleType>&)

INSTANTIATE_SPARSE_TENSOR(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR(SparseCSRIndex);

} // namespace arrow

26 changes: 19 additions & 7 deletions
cpp/src/arrow/sparse_tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,10 +217,20 @@ class ARROW_EXPORT SparseTensor {
// ----------------------------------------------------------------------
// SparseTensorImpl class

namespace internal {

ARROW_EXPORT
void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data);

} // namespace internal

/// \brief EXPERIMENTAL: Concrete sparse tensor implementation classes with sparse index
/// type
template <typename SparseIndexType>
class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
class SparseTensorImpl : public SparseTensor {
 public:
 virtual ~SparseTensorImpl() = default;

Expand All@@ -234,14 +244,16 @@ class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
 // Constructor for empty sparse tensor
 SparseTensorImpl(const std::shared_ptr<DataType>& type,
 const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names = {});

 // Constructor with a dense numeric tensor
 template <typename TYPE>
 explicit SparseTensorImpl(const NumericTensor<TYPE>& tensor);
 const std::vector<std::string>& dim_names = {})
 : SparseTensorImpl(NULLPTR, type, NULLPTR, shape, dim_names) {}

 // Constructor with a dense tensor
 explicit SparseTensorImpl(const Tensor& tensor);
 explicit SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(NULLPTR, tensor.type(), NULLPTR, tensor.shape(),
 tensor.dim_names_) {
 internal::MakeSparseTensorFromTensor(tensor, SparseIndexType::format_id,
 &sparse_index_, &data_);
 }

 private:
 ARROW_DISALLOW_COPY_AND_ASSIGN(SparseTensorImpl);
Expand Down

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

View file


Open in desktop

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

// 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__)
#define ARROW_TEMPLATE_CLASS_EXPORT
#define ARROW_TEMPLATE_EXPORT ARROW_EXPORT
#else
#define ARROW_TEMPLATE_CLASS_EXPORT ARROW_EXPORT
#define ARROW_TEMPLATE_EXPORT
#endif

#endif // ARROW_UTIL_VISIBILITY_H

, '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-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl#4670

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

mrkn
wants to merge
4
commits into

from

 Closed


ARROW-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl
#4670
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
6a14b96

Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl


mrkn Jun 24, 2019
5a6468f

Replace nullptr with NULLPTR


mrkn Jun 25, 2019
819cce5

Remove ARROW_EXPORT from SparseTensorImpl


mrkn Jun 25, 2019
a24f78c

Code review feedback


wesm Jun 26, 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


202 changes: 81 additions & 121 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,18 +135,6 @@ class SparseTensorConverter<TYPE, SparseCOOIndex>
 using BaseClass::tensor_;
};

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

// ----------------------------------------------------------------------
// SparseTensorConverter for SparseCSRIndex

Expand DownExpand Up@@ -244,6 +232,87 @@ INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);

} // namespace

namespace internal {

namespace {

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 ARROW_CHECK_OK(converter.Convert());
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

template <typename SparseIndexType>
inline void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, sparse_index,
 data);
 break;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Unsupported Tensor value type";
 break;
 }
}

} // namespace

void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (sparse_format_id) {
 case SparseTensorFormat::COO:
 MakeSparseTensorFromTensor<SparseCOOIndex>(tensor, sparse_index, data);
 break;
 case SparseTensorFormat::CSR:
 MakeSparseTensorFromTensor<SparseCSRIndex>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Invalid sparse tensor format ID";
 break;
 }
}

} // namespace internal

// ----------------------------------------------------------------------
// SparseCOOIndex

Expand DownExpand Up@@ -303,113 +372,4 @@ bool SparseTensor::Equals(const SparseTensor& other) const {
 return SparseTensorEquals(*this, other);
}

// ----------------------------------------------------------------------
// SparseTensorImpl

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(
 const std::shared_ptr<DataType>& type, const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names)
 : SparseTensorImpl(nullptr, type, nullptr, shape, dim_names) {}

// Constructor with a dense tensor
template <typename SparseIndexType>
template <typename TYPE>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const NumericTensor<TYPE>& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 SparseTensorConverter<TYPE, SparseIndexType> converter(tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 sparse_index_ = converter.sparse_index;
 data_ = converter.data;
}

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 default:
 break;
 }
}

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

#define INSTANTIATE_SPARSE_TENSOR(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorImpl<IndexType>; \
Comment thread
pitrou marked this conversation as resolved.


Outdated

 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<HalfFloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<FloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<DoubleType>&)

INSTANTIATE_SPARSE_TENSOR(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR(SparseCSRIndex);

} // namespace arrow

26 changes: 19 additions & 7 deletions
cpp/src/arrow/sparse_tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,10 +217,20 @@ class ARROW_EXPORT SparseTensor {
// ----------------------------------------------------------------------
// SparseTensorImpl class

namespace internal {

ARROW_EXPORT
void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data);

} // namespace internal

/// \brief EXPERIMENTAL: Concrete sparse tensor implementation classes with sparse index
/// type
template <typename SparseIndexType>
class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
class SparseTensorImpl : public SparseTensor {
 public:
 virtual ~SparseTensorImpl() = default;

Expand All@@ -234,14 +244,16 @@ class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
 // Constructor for empty sparse tensor
 SparseTensorImpl(const std::shared_ptr<DataType>& type,
 const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names = {});

 // Constructor with a dense numeric tensor
 template <typename TYPE>
 explicit SparseTensorImpl(const NumericTensor<TYPE>& tensor);
 const std::vector<std::string>& dim_names = {})
 : SparseTensorImpl(NULLPTR, type, NULLPTR, shape, dim_names) {}

 // Constructor with a dense tensor
 explicit SparseTensorImpl(const Tensor& tensor);
 explicit SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(NULLPTR, tensor.type(), NULLPTR, tensor.shape(),
 tensor.dim_names_) {
 internal::MakeSparseTensorFromTensor(tensor, SparseIndexType::format_id,
 &sparse_index_, &data_);
 }

 private:
 ARROW_DISALLOW_COPY_AND_ASSIGN(SparseTensorImpl);
Expand Down

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

View file


Open in desktop

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

// 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__)
#define ARROW_TEMPLATE_CLASS_EXPORT
#define ARROW_TEMPLATE_EXPORT ARROW_EXPORT
#else
#define ARROW_TEMPLATE_CLASS_EXPORT ARROW_EXPORT
#define ARROW_TEMPLATE_EXPORT
#endif

#endif // ARROW_UTIL_VISIBILITY_H

, '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-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl#4670

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

mrkn
wants to merge
4
commits into

from

 Closed


ARROW-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl
#4670
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
6a14b96

Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl


mrkn Jun 24, 2019
5a6468f

Replace nullptr with NULLPTR


mrkn Jun 25, 2019
819cce5

Remove ARROW_EXPORT from SparseTensorImpl


mrkn Jun 25, 2019
a24f78c

Code review feedback


wesm Jun 26, 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


202 changes: 81 additions & 121 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,18 +135,6 @@ class SparseTensorConverter<TYPE, SparseCOOIndex>
 using BaseClass::tensor_;
};

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

// ----------------------------------------------------------------------
// SparseTensorConverter for SparseCSRIndex

Expand DownExpand Up@@ -244,6 +232,87 @@ INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);

} // namespace

namespace internal {

namespace {

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 ARROW_CHECK_OK(converter.Convert());
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

template <typename SparseIndexType>
inline void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, sparse_index,
 data);
 break;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Unsupported Tensor value type";
 break;
 }
}

} // namespace

void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (sparse_format_id) {
 case SparseTensorFormat::COO:
 MakeSparseTensorFromTensor<SparseCOOIndex>(tensor, sparse_index, data);
 break;
 case SparseTensorFormat::CSR:
 MakeSparseTensorFromTensor<SparseCSRIndex>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Invalid sparse tensor format ID";
 break;
 }
}

} // namespace internal

// ----------------------------------------------------------------------
// SparseCOOIndex

Expand DownExpand Up@@ -303,113 +372,4 @@ bool SparseTensor::Equals(const SparseTensor& other) const {
 return SparseTensorEquals(*this, other);
}

// ----------------------------------------------------------------------
// SparseTensorImpl

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(
 const std::shared_ptr<DataType>& type, const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names)
 : SparseTensorImpl(nullptr, type, nullptr, shape, dim_names) {}

// Constructor with a dense tensor
template <typename SparseIndexType>
template <typename TYPE>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const NumericTensor<TYPE>& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 SparseTensorConverter<TYPE, SparseIndexType> converter(tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 sparse_index_ = converter.sparse_index;
 data_ = converter.data;
}

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 default:
 break;
 }
}

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

#define INSTANTIATE_SPARSE_TENSOR(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorImpl<IndexType>; \
Comment thread
pitrou marked this conversation as resolved.


Outdated

 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<HalfFloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<FloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<DoubleType>&)

INSTANTIATE_SPARSE_TENSOR(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR(SparseCSRIndex);

} // namespace arrow

26 changes: 19 additions & 7 deletions
cpp/src/arrow/sparse_tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,10 +217,20 @@ class ARROW_EXPORT SparseTensor {
// ----------------------------------------------------------------------
// SparseTensorImpl class

namespace internal {

ARROW_EXPORT
void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data);

} // namespace internal

/// \brief EXPERIMENTAL: Concrete sparse tensor implementation classes with sparse index
/// type
template <typename SparseIndexType>
class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
class SparseTensorImpl : public SparseTensor {
 public:
 virtual ~SparseTensorImpl() = default;

Expand All@@ -234,14 +244,16 @@ class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
 // Constructor for empty sparse tensor
 SparseTensorImpl(const std::shared_ptr<DataType>& type,
 const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names = {});

 // Constructor with a dense numeric tensor
 template <typename TYPE>
 explicit SparseTensorImpl(const NumericTensor<TYPE>& tensor);
 const std::vector<std::string>& dim_names = {})
 : SparseTensorImpl(NULLPTR, type, NULLPTR, shape, dim_names) {}

 // Constructor with a dense tensor
 explicit SparseTensorImpl(const Tensor& tensor);
 explicit SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(NULLPTR, tensor.type(), NULLPTR, tensor.shape(),
 tensor.dim_names_) {
 internal::MakeSparseTensorFromTensor(tensor, SparseIndexType::format_id,
 &sparse_index_, &data_);
 }

 private:
 ARROW_DISALLOW_COPY_AND_ASSIGN(SparseTensorImpl);
Expand Down

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

View file


Open in desktop

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

// 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__)
#define ARROW_TEMPLATE_CLASS_EXPORT
#define ARROW_TEMPLATE_EXPORT ARROW_EXPORT
#else
#define ARROW_TEMPLATE_CLASS_EXPORT ARROW_EXPORT
#define ARROW_TEMPLATE_EXPORT
#endif

#endif // ARROW_UTIL_VISIBILITY_H

, '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-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl#4670

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

mrkn
wants to merge
4
commits into

from

 Closed


ARROW-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl
#4670
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
6a14b96

Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl


mrkn Jun 24, 2019
5a6468f

Replace nullptr with NULLPTR


mrkn Jun 25, 2019
819cce5

Remove ARROW_EXPORT from SparseTensorImpl


mrkn Jun 25, 2019
a24f78c

Code review feedback


wesm Jun 26, 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


202 changes: 81 additions & 121 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,18 +135,6 @@ class SparseTensorConverter<TYPE, SparseCOOIndex>
 using BaseClass::tensor_;
};

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

// ----------------------------------------------------------------------
// SparseTensorConverter for SparseCSRIndex

Expand DownExpand Up@@ -244,6 +232,87 @@ INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);

} // namespace

namespace internal {

namespace {

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 ARROW_CHECK_OK(converter.Convert());
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

template <typename SparseIndexType>
inline void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, sparse_index,
 data);
 break;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Unsupported Tensor value type";
 break;
 }
}

} // namespace

void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (sparse_format_id) {
 case SparseTensorFormat::COO:
 MakeSparseTensorFromTensor<SparseCOOIndex>(tensor, sparse_index, data);
 break;
 case SparseTensorFormat::CSR:
 MakeSparseTensorFromTensor<SparseCSRIndex>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Invalid sparse tensor format ID";
 break;
 }
}

} // namespace internal

// ----------------------------------------------------------------------
// SparseCOOIndex

Expand DownExpand Up@@ -303,113 +372,4 @@ bool SparseTensor::Equals(const SparseTensor& other) const {
 return SparseTensorEquals(*this, other);
}

// ----------------------------------------------------------------------
// SparseTensorImpl

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(
 const std::shared_ptr<DataType>& type, const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names)
 : SparseTensorImpl(nullptr, type, nullptr, shape, dim_names) {}

// Constructor with a dense tensor
template <typename SparseIndexType>
template <typename TYPE>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const NumericTensor<TYPE>& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 SparseTensorConverter<TYPE, SparseIndexType> converter(tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 sparse_index_ = converter.sparse_index;
 data_ = converter.data;
}

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 default:
 break;
 }
}

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

#define INSTANTIATE_SPARSE_TENSOR(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorImpl<IndexType>; \
Comment thread
pitrou marked this conversation as resolved.


Outdated

 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<HalfFloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<FloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<DoubleType>&)

INSTANTIATE_SPARSE_TENSOR(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR(SparseCSRIndex);

} // namespace arrow

26 changes: 19 additions & 7 deletions
cpp/src/arrow/sparse_tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,10 +217,20 @@ class ARROW_EXPORT SparseTensor {
// ----------------------------------------------------------------------
// SparseTensorImpl class

namespace internal {

ARROW_EXPORT
void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data);

} // namespace internal

/// \brief EXPERIMENTAL: Concrete sparse tensor implementation classes with sparse index
/// type
template <typename SparseIndexType>
class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
class SparseTensorImpl : public SparseTensor {
 public:
 virtual ~SparseTensorImpl() = default;

Expand All@@ -234,14 +244,16 @@ class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
 // Constructor for empty sparse tensor
 SparseTensorImpl(const std::shared_ptr<DataType>& type,
 const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names = {});

 // Constructor with a dense numeric tensor
 template <typename TYPE>
 explicit SparseTensorImpl(const NumericTensor<TYPE>& tensor);
 const std::vector<std::string>& dim_names = {})
 : SparseTensorImpl(NULLPTR, type, NULLPTR, shape, dim_names) {}

 // Constructor with a dense tensor
 explicit SparseTensorImpl(const Tensor& tensor);
 explicit SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(NULLPTR, tensor.type(), NULLPTR, tensor.shape(),
 tensor.dim_names_) {
 internal::MakeSparseTensorFromTensor(tensor, SparseIndexType::format_id,
 &sparse_index_, &data_);
 }

 private:
 ARROW_DISALLOW_COPY_AND_ASSIGN(SparseTensorImpl);
Expand Down

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

View file


Open in desktop

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

// 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__)
#define ARROW_TEMPLATE_CLASS_EXPORT
#define ARROW_TEMPLATE_EXPORT ARROW_EXPORT
#else
#define ARROW_TEMPLATE_CLASS_EXPORT ARROW_EXPORT
#define ARROW_TEMPLATE_EXPORT
#endif

#endif // ARROW_UTIL_VISIBILITY_H

, '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-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl#4670

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

mrkn
wants to merge
4
commits into

from

 Closed


ARROW-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl
#4670
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
6a14b96

Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl


mrkn Jun 24, 2019
5a6468f

Replace nullptr with NULLPTR


mrkn Jun 25, 2019
819cce5

Remove ARROW_EXPORT from SparseTensorImpl


mrkn Jun 25, 2019
a24f78c

Code review feedback


wesm Jun 26, 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


202 changes: 81 additions & 121 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,18 +135,6 @@ class SparseTensorConverter<TYPE, SparseCOOIndex>
 using BaseClass::tensor_;
};

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

// ----------------------------------------------------------------------
// SparseTensorConverter for SparseCSRIndex

Expand DownExpand Up@@ -244,6 +232,87 @@ INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);

} // namespace

namespace internal {

namespace {

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 ARROW_CHECK_OK(converter.Convert());
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

template <typename SparseIndexType>
inline void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, sparse_index,
 data);
 break;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Unsupported Tensor value type";
 break;
 }
}

} // namespace

void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (sparse_format_id) {
 case SparseTensorFormat::COO:
 MakeSparseTensorFromTensor<SparseCOOIndex>(tensor, sparse_index, data);
 break;
 case SparseTensorFormat::CSR:
 MakeSparseTensorFromTensor<SparseCSRIndex>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Invalid sparse tensor format ID";
 break;
 }
}

} // namespace internal

// ----------------------------------------------------------------------
// SparseCOOIndex

Expand DownExpand Up@@ -303,113 +372,4 @@ bool SparseTensor::Equals(const SparseTensor& other) const {
 return SparseTensorEquals(*this, other);
}

// ----------------------------------------------------------------------
// SparseTensorImpl

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(
 const std::shared_ptr<DataType>& type, const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names)
 : SparseTensorImpl(nullptr, type, nullptr, shape, dim_names) {}

// Constructor with a dense tensor
template <typename SparseIndexType>
template <typename TYPE>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const NumericTensor<TYPE>& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 SparseTensorConverter<TYPE, SparseIndexType> converter(tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 sparse_index_ = converter.sparse_index;
 data_ = converter.data;
}

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 default:
 break;
 }
}

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

#define INSTANTIATE_SPARSE_TENSOR(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorImpl<IndexType>; \
Comment thread
pitrou marked this conversation as resolved.


Outdated

 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<HalfFloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<FloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<DoubleType>&)

INSTANTIATE_SPARSE_TENSOR(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR(SparseCSRIndex);

} // namespace arrow

26 changes: 19 additions & 7 deletions
cpp/src/arrow/sparse_tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,10 +217,20 @@ class ARROW_EXPORT SparseTensor {
// ----------------------------------------------------------------------
// SparseTensorImpl class

namespace internal {

ARROW_EXPORT
void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data);

} // namespace internal

/// \brief EXPERIMENTAL: Concrete sparse tensor implementation classes with sparse index
/// type
template <typename SparseIndexType>
class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
class SparseTensorImpl : public SparseTensor {
 public:
 virtual ~SparseTensorImpl() = default;

Expand All@@ -234,14 +244,16 @@ class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
 // Constructor for empty sparse tensor
 SparseTensorImpl(const std::shared_ptr<DataType>& type,
 const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names = {});

 // Constructor with a dense numeric tensor
 template <typename TYPE>
 explicit SparseTensorImpl(const NumericTensor<TYPE>& tensor);
 const std::vector<std::string>& dim_names = {})
 : SparseTensorImpl(NULLPTR, type, NULLPTR, shape, dim_names) {}

 // Constructor with a dense tensor
 explicit SparseTensorImpl(const Tensor& tensor);
 explicit SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(NULLPTR, tensor.type(), NULLPTR, tensor.shape(),
 tensor.dim_names_) {
 internal::MakeSparseTensorFromTensor(tensor, SparseIndexType::format_id,
 &sparse_index_, &data_);
 }

 private:
 ARROW_DISALLOW_COPY_AND_ASSIGN(SparseTensorImpl);
Expand Down

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

View file


Open in desktop

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

// 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__)
#define ARROW_TEMPLATE_CLASS_EXPORT
#define ARROW_TEMPLATE_EXPORT ARROW_EXPORT
#else
#define ARROW_TEMPLATE_CLASS_EXPORT ARROW_EXPORT
#define ARROW_TEMPLATE_EXPORT
#endif

#endif // ARROW_UTIL_VISIBILITY_H

, '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-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl#4670

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

mrkn
wants to merge
4
commits into

from

 Closed


ARROW-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl
#4670
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
6a14b96

Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl


mrkn Jun 24, 2019
5a6468f

Replace nullptr with NULLPTR


mrkn Jun 25, 2019
819cce5

Remove ARROW_EXPORT from SparseTensorImpl


mrkn Jun 25, 2019
a24f78c

Code review feedback


wesm Jun 26, 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


202 changes: 81 additions & 121 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,18 +135,6 @@ class SparseTensorConverter<TYPE, SparseCOOIndex>
 using BaseClass::tensor_;
};

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

// ----------------------------------------------------------------------
// SparseTensorConverter for SparseCSRIndex

Expand DownExpand Up@@ -244,6 +232,87 @@ INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);

} // namespace

namespace internal {

namespace {

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 ARROW_CHECK_OK(converter.Convert());
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

template <typename SparseIndexType>
inline void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, sparse_index,
 data);
 break;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Unsupported Tensor value type";
 break;
 }
}

} // namespace

void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (sparse_format_id) {
 case SparseTensorFormat::COO:
 MakeSparseTensorFromTensor<SparseCOOIndex>(tensor, sparse_index, data);
 break;
 case SparseTensorFormat::CSR:
 MakeSparseTensorFromTensor<SparseCSRIndex>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Invalid sparse tensor format ID";
 break;
 }
}

} // namespace internal

// ----------------------------------------------------------------------
// SparseCOOIndex

Expand DownExpand Up@@ -303,113 +372,4 @@ bool SparseTensor::Equals(const SparseTensor& other) const {
 return SparseTensorEquals(*this, other);
}

// ----------------------------------------------------------------------
// SparseTensorImpl

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(
 const std::shared_ptr<DataType>& type, const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names)
 : SparseTensorImpl(nullptr, type, nullptr, shape, dim_names) {}

// Constructor with a dense tensor
template <typename SparseIndexType>
template <typename TYPE>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const NumericTensor<TYPE>& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 SparseTensorConverter<TYPE, SparseIndexType> converter(tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 sparse_index_ = converter.sparse_index;
 data_ = converter.data;
}

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 default:
 break;
 }
}

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

#define INSTANTIATE_SPARSE_TENSOR(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorImpl<IndexType>; \
Comment thread
pitrou marked this conversation as resolved.


Outdated

 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<HalfFloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<FloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<DoubleType>&)

INSTANTIATE_SPARSE_TENSOR(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR(SparseCSRIndex);

} // namespace arrow

26 changes: 19 additions & 7 deletions
cpp/src/arrow/sparse_tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,10 +217,20 @@ class ARROW_EXPORT SparseTensor {
// ----------------------------------------------------------------------
// SparseTensorImpl class

namespace internal {

ARROW_EXPORT
void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data);

} // namespace internal

/// \brief EXPERIMENTAL: Concrete sparse tensor implementation classes with sparse index
/// type
template <typename SparseIndexType>
class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
class SparseTensorImpl : public SparseTensor {
 public:
 virtual ~SparseTensorImpl() = default;

Expand All@@ -234,14 +244,16 @@ class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
 // Constructor for empty sparse tensor
 SparseTensorImpl(const std::shared_ptr<DataType>& type,
 const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names = {});

 // Constructor with a dense numeric tensor
 template <typename TYPE>
 explicit SparseTensorImpl(const NumericTensor<TYPE>& tensor);
 const std::vector<std::string>& dim_names = {})
 : SparseTensorImpl(NULLPTR, type, NULLPTR, shape, dim_names) {}

 // Constructor with a dense tensor
 explicit SparseTensorImpl(const Tensor& tensor);
 explicit SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(NULLPTR, tensor.type(), NULLPTR, tensor.shape(),
 tensor.dim_names_) {
 internal::MakeSparseTensorFromTensor(tensor, SparseIndexType::format_id,
 &sparse_index_, &data_);
 }

 private:
 ARROW_DISALLOW_COPY_AND_ASSIGN(SparseTensorImpl);
Expand Down

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

View file


Open in desktop

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

// 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__)
#define ARROW_TEMPLATE_CLASS_EXPORT
#define ARROW_TEMPLATE_EXPORT ARROW_EXPORT
#else
#define ARROW_TEMPLATE_CLASS_EXPORT ARROW_EXPORT
#define ARROW_TEMPLATE_EXPORT
#endif

#endif // ARROW_UTIL_VISIBILITY_H

, '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-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl#4670

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

mrkn
wants to merge
4
commits into

from

 Closed


ARROW-5704: [C++] Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl
#4670
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
6a14b96

Stop using ARROW_TEMPLATE_EXPORT for SparseTensorImpl


mrkn Jun 24, 2019
5a6468f

Replace nullptr with NULLPTR


mrkn Jun 25, 2019
819cce5

Remove ARROW_EXPORT from SparseTensorImpl


mrkn Jun 25, 2019
a24f78c

Code review feedback


wesm Jun 26, 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


202 changes: 81 additions & 121 deletions
cpp/src/arrow/sparse_tensor.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -135,18 +135,6 @@ class SparseTensorConverter<TYPE, SparseCOOIndex>
 using BaseClass::tensor_;
};

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

// ----------------------------------------------------------------------
// SparseTensorConverter for SparseCSRIndex

Expand DownExpand Up@@ -244,6 +232,87 @@ INSTANTIATE_SPARSE_TENSOR_CONVERTER(SparseCSRIndex);

} // namespace

namespace internal {

namespace {

template <typename TYPE, typename SparseIndexType>
void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 NumericTensor<TYPE> numeric_tensor(tensor.data(), tensor.shape(), tensor.strides());
 SparseTensorConverter<TYPE, SparseIndexType> converter(numeric_tensor);
 ARROW_CHECK_OK(converter.Convert());
 *sparse_index = converter.sparse_index;
 *data = converter.data;
}

template <typename SparseIndexType>
inline void MakeSparseTensorFromTensor(const Tensor& tensor,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, sparse_index,
 data);
 break;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, sparse_index, data);
 break;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Unsupported Tensor value type";
 break;
 }
}

} // namespace

void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data) {
 switch (sparse_format_id) {
 case SparseTensorFormat::COO:
 MakeSparseTensorFromTensor<SparseCOOIndex>(tensor, sparse_index, data);
 break;
 case SparseTensorFormat::CSR:
 MakeSparseTensorFromTensor<SparseCSRIndex>(tensor, sparse_index, data);
 break;
 default:
 ARROW_LOG(FATAL) << "Invalid sparse tensor format ID";
 break;
 }
}

} // namespace internal

// ----------------------------------------------------------------------
// SparseCOOIndex

Expand DownExpand Up@@ -303,113 +372,4 @@ bool SparseTensor::Equals(const SparseTensor& other) const {
 return SparseTensorEquals(*this, other);
}

// ----------------------------------------------------------------------
// SparseTensorImpl

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(
 const std::shared_ptr<DataType>& type, const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names)
 : SparseTensorImpl(nullptr, type, nullptr, shape, dim_names) {}

// Constructor with a dense tensor
template <typename SparseIndexType>
template <typename TYPE>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const NumericTensor<TYPE>& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 SparseTensorConverter<TYPE, SparseIndexType> converter(tensor);
 Status s = converter.Convert();
 DCHECK_OK(s);
 sparse_index_ = converter.sparse_index;
 data_ = converter.data;
}

// Constructor with a dense tensor
template <typename SparseIndexType>
SparseTensorImpl<SparseIndexType>::SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(nullptr, tensor.type(), nullptr, tensor.shape(),
 tensor.dim_names_) {
 switch (tensor.type()->id()) {
 case Type::UINT8:
 MakeSparseTensorFromTensor<UInt8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT8:
 MakeSparseTensorFromTensor<Int8Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT16:
 MakeSparseTensorFromTensor<UInt16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT16:
 MakeSparseTensorFromTensor<Int16Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT32:
 MakeSparseTensorFromTensor<UInt32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT32:
 MakeSparseTensorFromTensor<Int32Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::UINT64:
 MakeSparseTensorFromTensor<UInt64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::INT64:
 MakeSparseTensorFromTensor<Int64Type, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::HALF_FLOAT:
 MakeSparseTensorFromTensor<HalfFloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::FLOAT:
 MakeSparseTensorFromTensor<FloatType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 case Type::DOUBLE:
 MakeSparseTensorFromTensor<DoubleType, SparseIndexType>(tensor, &sparse_index_,
 &data_);
 return;
 default:
 break;
 }
}

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

#define INSTANTIATE_SPARSE_TENSOR(IndexType) \
 template class ARROW_TEMPLATE_EXPORT SparseTensorImpl<IndexType>; \
Comment thread
pitrou marked this conversation as resolved.


Outdated

 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<UInt64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int8Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int16Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int32Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<Int64Type>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<HalfFloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<FloatType>&); \
 template ARROW_EXPORT SparseTensorImpl<IndexType>::SparseTensorImpl( \
 const NumericTensor<DoubleType>&)

INSTANTIATE_SPARSE_TENSOR(SparseCOOIndex);
INSTANTIATE_SPARSE_TENSOR(SparseCSRIndex);

} // namespace arrow

26 changes: 19 additions & 7 deletions
cpp/src/arrow/sparse_tensor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,10 +217,20 @@ class ARROW_EXPORT SparseTensor {
// ----------------------------------------------------------------------
// SparseTensorImpl class

namespace internal {

ARROW_EXPORT
void MakeSparseTensorFromTensor(const Tensor& tensor,
 SparseTensorFormat::type sparse_format_id,
 std::shared_ptr<SparseIndex>* sparse_index,
 std::shared_ptr<Buffer>* data);

} // namespace internal

/// \brief EXPERIMENTAL: Concrete sparse tensor implementation classes with sparse index
/// type
template <typename SparseIndexType>
class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
class SparseTensorImpl : public SparseTensor {
 public:
 virtual ~SparseTensorImpl() = default;

Expand All@@ -234,14 +244,16 @@ class ARROW_EXPORT SparseTensorImpl : public SparseTensor {
 // Constructor for empty sparse tensor
 SparseTensorImpl(const std::shared_ptr<DataType>& type,
 const std::vector<int64_t>& shape,
 const std::vector<std::string>& dim_names = {});

 // Constructor with a dense numeric tensor
 template <typename TYPE>
 explicit SparseTensorImpl(const NumericTensor<TYPE>& tensor);
 const std::vector<std::string>& dim_names = {})
 : SparseTensorImpl(NULLPTR, type, NULLPTR, shape, dim_names) {}

 // Constructor with a dense tensor
 explicit SparseTensorImpl(const Tensor& tensor);
 explicit SparseTensorImpl(const Tensor& tensor)
 : SparseTensorImpl(NULLPTR, tensor.type(), NULLPTR, tensor.shape(),
 tensor.dim_names_) {
 internal::MakeSparseTensorFromTensor(tensor, SparseIndexType::format_id,
 &sparse_index_, &data_);
 }

 private:
 ARROW_DISALLOW_COPY_AND_ASSIGN(SparseTensorImpl);
Expand Down

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

View file


Open in desktop

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

// 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__)
#define ARROW_TEMPLATE_CLASS_EXPORT
#define ARROW_TEMPLATE_EXPORT ARROW_EXPORT
#else
#define ARROW_TEMPLATE_CLASS_EXPORT ARROW_EXPORT
#define ARROW_TEMPLATE_EXPORT
#endif

#endif // ARROW_UTIL_VISIBILITY_H