Skip to content
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.

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

deletes everything we deprecated for #4074 #4229

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
95 changes: 0 additions & 95 deletions src/interfaces/swig/Library.i
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@
%rename(IndexBlockTree) CIndexBlockTree;
%rename(Data) CData;

%rename(IndependentComputationEngine) CIndependentComputationEngine;
%rename(SerialComputationEngine) CSerialComputationEngine;


%ignore RADIX_STACK_SIZE;
%ignore NUMTRAPPEDSIGS;
%ignore TRIE_TERMINAL_CHARACTER;
Expand Down Expand Up @@ -446,94 +442,3 @@ namespace shogun
%include <shogun/lib/IndexBlockGroup.h>
%include <shogun/lib/IndexBlockTree.h>
%include <shogun/lib/Data.h>

/* Computation framework */

/* Computation Engine */
%rename (IndependentComputationEngine) CIndependentComputationEngine;
%rename (SerialComputationEngine) CSerialComputationEngine;

%include <shogun/lib/computation/engine/IndependentComputationEngine.h>
%include <shogun/lib/computation/engine/SerialComputationEngine.h>

/* Independent compution-job */
%include <shogun/lib/computation/job/IndependentJob.h>

/* Independent computation-job results */
%rename (JobResult) CJobResult;
%include <shogun/lib/computation/jobresult/JobResult.h>
%include <shogun/lib/computation/jobresult/ScalarResult.h>
namespace shogun
{
#ifdef USE_CHAR
%template(ScalarCharResult) CScalarResult<char>;
#endif
#ifdef USE_BOOL
%template(ScalarBoolResult) CScalarResult<bool>;
#endif
#ifdef USE_UINT8
%template(ScalarByteResult) CScalarResult<uint8_t>;
#endif
#ifdef USE_INT16
%template(ScalarShortResult) CScalarResult<int16_t>;
#endif
#ifdef USE_UINT16
%template(ScalarWordResult) CScalarResult<uint16_t>;
#endif
#ifdef USE_INT32
%template(ScalarIntResult) CScalarResult<int32_t>;
#endif
#ifdef USE_UINT32
%template(ScalarUIntResult) CScalarResult<uint32_t>;
#endif
#ifdef USE_INT64
%template(ScalarLongResult) CScalarResult<int64_t>;
#endif
#ifdef USE_UINT64
%template(ScalarULongResult) CScalarResult<uint64_t>;
#endif
#ifdef USE_FLOAT32
%template(ScalarShortRealResult) CScalarResult<float32_t>;
#endif
#ifdef USE_FLOAT64
%template(ScalarRealResult) CScalarResult<float64_t>;
#endif
}

%include <shogun/lib/computation/jobresult/VectorResult.h>
namespace shogun
{
#ifdef USE_CHAR
%template(VectorCharResult) CVectorResult<char>;
#endif
#ifdef USE_BOOL
%template(VectorBoolResult) CVectorResult<bool>;
#endif
#ifdef USE_UINT8
%template(VectorByteResult) CVectorResult<uint8_t>;
#endif
#ifdef USE_INT16
%template(VectorShortResult) CVectorResult<int16_t>;
#endif
#ifdef USE_UINT16
%template(VectorWordResult) CVectorResult<uint16_t>;
#endif
#ifdef USE_INT32
%template(VectorIntResult) CVectorResult<int32_t>;
#endif
#ifdef USE_UINT32
%template(VectorUIntResult) CVectorResult<uint32_t>;
#endif
#ifdef USE_INT64
%template(VectorLongResult) CVectorResult<int64_t>;
#endif
#ifdef USE_UINT64
%template(VectorULongResult) CVectorResult<uint64_t>;
#endif
#ifdef USE_FLOAT32
%template(VectorShortRealResult) CVectorResult<float32_t>;
#endif
#ifdef USE_FLOAT64
%template(VectorRealResult) CVectorResult<float64_t>;
#endif
}
6 changes: 0 additions & 6 deletions src/interfaces/swig/Library_includes.i
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,4 @@
#include <shogun/lib/Tokenizer.h>
#include <shogun/lib/DelimiterTokenizer.h>
#include <shogun/lib/NGramTokenizer.h>
#include <shogun/lib/computation/engine/IndependentComputationEngine.h>
#include <shogun/lib/computation/engine/SerialComputationEngine.h>
#include <shogun/lib/computation/job/IndependentJob.h>
#include <shogun/lib/computation/jobresult/JobResult.h>
#include <shogun/lib/computation/jobresult/ScalarResult.h>
#include <shogun/lib/computation/jobresult/VectorResult.h>
%}
84 changes: 0 additions & 84 deletions src/shogun/lib/computation/aggregator/JobResultAggregator.h

This file was deleted.

83 changes: 0 additions & 83 deletions src/shogun/lib/computation/aggregator/StoreScalarAggregator.cpp

This file was deleted.

63 changes: 0 additions & 63 deletions src/shogun/lib/computation/aggregator/StoreScalarAggregator.h

This file was deleted.