Skip to content

Commit 7ae6bd5

Browse files
committed
Try to fix windows compile issue
1 parent a9565a6 commit 7ae6bd5

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

doc/pages/Python-tutorial-intro.dox

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,11 @@ Here is a complete example on how to do this:
343343

344344
@include Python/python_process_object.py
345345

346+
## Run OpenCL code from Python
347+
348+
FAST provides a high-level interface for using OpenCL in process objects in Python.
349+
[See the GPU processing in Python tutorial for more information](@ref python-tutorial-opencl).
350+
346351
Exporting data
347352
---------------------
348353
To save data in a given file format, you can use any of the [FAST Exporters](@ref exporters).

source/FAST/Data/DataTypes.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ using Eigen::Affine3f;
3333
using Eigen::AngleAxisf;
3434
typedef Eigen::Matrix<uint, Eigen::Dynamic, 1> VectorXui;
3535
typedef Eigen::Matrix<uint, 4, 1> Vector4ui;
36-
typedef Eigen::Matrix<uint, 3, 1> EigenVector3ui;
3736
typedef Eigen::Matrix<uint, 2, 1> Vector2ui;
3837

39-
class FAST_EXPORT Vector3ui : public Eigen::Matrix<uint, 3, 1> {
38+
// This to make sure the Vector3ui can be implicitly converted to std::vector<int>
39+
typedef Eigen::Matrix<uint, 3, 1> EigenVector3ui;
40+
class FAST_EXPORT Vector3ui : public EigenVector3ui {
4041
public:
4142
using EigenVector3ui::EigenVector3ui; // Inherit constructors
4243
operator std::vector<int>() const {

source/FAST/OpenCLProgram.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ cl::Program OpenCLProgram::build(std::shared_ptr<OpenCLDevice> device,
4646
device->createProgramFromSourceWithName(programName, mSourceFilename, buildOptions);
4747
} else {
4848
// Only create program if it doesn't exist for this device from before
49+
// TODO consider using hash instead of potentially long source code string as name here
4950
programName = m_sourceCode + buildOptions;
5051
if(!device->hasProgram(programName))
5152
device->createProgramFromStringWithName(programName, m_sourceCode, buildOptions);

0 commit comments

Comments
 (0)