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.

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

OpenCV 4.5.1 with CUDA support #976

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
+2,202 −1,551
Open

OpenCV 4.5.1 with CUDA support #976

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0f9e4f4
Subsantial progress towards opencv/cuda 4.5.1
GrantPerkins Jul 21, 2021
0b137b3
Generated code pass build
GrantPerkins Jul 21, 2021
efad46b
Finally pass build
GrantPerkins Jul 21, 2021
ac5753d
Fix test build
GrantPerkins Jul 26, 2021
c2f91df
Fix test runtime error
GrantPerkins Jul 26, 2021
c9d6a60
Pass checkstyle
GrantPerkins Jul 26, 2021
7d2ff00
Revert "Pass checkstyle"
GrantPerkins Jul 26, 2021
8adc1d3
Format java files
GrantPerkins Jul 26, 2021
6275c35
Update javadoc ref
GrantPerkins Jul 26, 2021
f682140
Fix testing import
GrantPerkins Jul 26, 2021
b416248
Bump codegen testing to opencv 4
GrantPerkins Jul 26, 2021
12a0fb2
Fix imports for Convex Hulls Generation testing
GrantPerkins Jul 26, 2021
da950dc
Print image size for debug
GrantPerkins Jul 30, 2021
2cf7976
Exit status of height for check
GrantPerkins Jul 30, 2021
0be3f23
Bump java to 11 in build.gradle
GrantPerkins Jul 30, 2021
adf0ee7
Fix checkstyle in test
GrantPerkins Jul 30, 2021
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
Prev Previous commit
Next Next commit
Fix test build
@GrantPerkins
GrantPerkins committed Jul 26, 2021
commit ac5753d7b3f0481557b409cf7ce8bcdfa6bad54a
2 changes: 1 addition & 1 deletion core/src/test/java/edu/wpi/grip/core/AddOperation.java
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.eventbus.EventBus;

import org.bytedeco.javacpp.opencv_core;
import org.bytedeco.opencv.global.opencv_core;

import java.util.List;

6 changes: 3 additions & 3 deletions core/src/test/java/edu/wpi/grip/core/operations/opencv/AddOperationTest.java
View file
Original file line number Diff line number Diff line change
@@ -7,9 +7,9 @@

import com.google.common.eventbus.EventBus;

import org.bytedeco.javacpp.opencv_core;
import org.bytedeco.javacpp.opencv_core.Mat;
import org.bytedeco.javacpp.opencv_core.Scalar;
import org.bytedeco.opencv.global.opencv_core;
import org.bytedeco.opencv.opencv_core.Mat;
import org.bytedeco.opencv.opencv_core.Scalar;
import org.junit.Before;
import org.junit.Test;

12 changes: 6 additions & 6 deletions core/src/test/java/edu/wpi/grip/core/serialization/ProjectTest.java
View file
Original file line number Diff line number Diff line change
@@ -40,12 +40,12 @@

import static junit.framework.Assert.assertNotNull;
import static junit.framework.TestCase.assertEquals;
import static org.bytedeco.javacpp.opencv_core.CMP_NE;
import static org.bytedeco.javacpp.opencv_core.CV_32F;
import static org.bytedeco.javacpp.opencv_core.Mat;
import static org.bytedeco.javacpp.opencv_core.Scalar;
import static org.bytedeco.javacpp.opencv_core.compare;
import static org.bytedeco.javacpp.opencv_core.countNonZero;
import static org.bytedeco.opencv.global.opencv_core.CMP_NE;
import static org.bytedeco.opencv.global.opencv_core.CV_32F;
import org.bytedeco.opencv.opencv_core.Mat;
import org.bytedeco.opencv.opencv_core.Scalar;
import static org.bytedeco.opencv.global.opencv_core.compare;
import static org.bytedeco.opencv.global.opencv_core.countNonZero;

public class ProjectTest {

2 changes: 1 addition & 1 deletion core/src/test/java/edu/wpi/grip/core/sources/CameraSourceTest.java
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
import net.jodah.concurrentunit.Waiter;

import org.bytedeco.javacpp.indexer.Indexer;
import org.bytedeco.javacpp.opencv_core.Mat;
import org.bytedeco.opencv.opencv_core.Mat;
import org.bytedeco.javacv.Frame;
import org.bytedeco.javacv.FrameGrabber;
import org.bytedeco.javacv.OpenCVFrameConverter;
2 changes: 1 addition & 1 deletion core/src/test/java/edu/wpi/grip/core/sources/GrabberServiceTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.wpi.grip.core.sources;

import org.bytedeco.javacpp.opencv_core.Mat;
import org.bytedeco.opencv.opencv_core.Mat;
import org.bytedeco.javacv.Frame;
import org.bytedeco.javacv.FrameGrabber;
import org.bytedeco.javacv.OpenCVFrameConverter;
2 changes: 1 addition & 1 deletion core/src/test/java/edu/wpi/grip/util/ImageWithData.java
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
import edu.wpi.grip.core.MatWrapper;
import edu.wpi.grip.core.util.ImageLoadingUtility;

import org.bytedeco.javacpp.opencv_core.Mat;
import org.bytedeco.opencv.opencv_core.Mat;

import java.io.File;
import java.io.IOException;