Skip to content

Build with cuda 10.1 and NPP 10.2.0.243#15653

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
tolysz:patch-1
Oct 7, 2019
Merged

Build with cuda 10.1 and NPP 10.2.0.243#15653
opencv-pushbot merged 1 commit intoopencv:3.4from
tolysz:patch-1

Conversation

@tolysz
Copy link
Copy Markdown
Contributor

@tolysz tolysz commented Oct 6, 2019 •
edited by alalek
Loading

Fix compiler warnings for latest cuda npp which defines this itself as:

#define NPP_VER_MAJOR 10
#define NPP_VER_MINOR 2
#define NPP_VER_PATCH 0
#define NPP_VER_BUILD 243

#define NPP_VERSION (NPP_VER_MAJOR * 1000 +     \
                     NPP_VER_MINOR *  100 +     \
                     NPP_VER_PATCH)

This pullrequest changes

opencv_contrib=
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Custom=ubuntu-cuda:16.04

@alalek
Copy link
Copy Markdown
Member

alalek commented Oct 6, 2019

Thank you for contribution!

This patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@tolysz tolysz changed the base branch from master to 3.4 October 7, 2019 09:55
@tolysz tolysz force-pushed the patch-1 branch 3 times, most recently from fafefe4 to 8d2c46d Compare October 7, 2019 10:41
@tolysz
Fix compiler warnings for latest cuda npp which defines this itself as:
53400d8 
```
#define NPP_VER_MAJOR 10
#define NPP_VER_MINOR 2
#define NPP_VER_PATCH 0
#define NPP_VER_BUILD 243

#define NPP_VERSION (NPP_VER_MAJOR * 1000 +     \
                     NPP_VER_MINOR *  100 +     \
                     NPP_VER_PATCH)
@tolysz
Copy link
Copy Markdown
Contributor Author

tolysz commented Oct 7, 2019

done

alalek
alalek approved these changes Oct 7, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

opencv-pushbot pushed a commit that referenced this pull request Oct 7, 2019
@alalek
Merge pull request #15653 from tolysz:patch-1
ebb77bb
@opencv-pushbot opencv-pushbot merged commit 53400d8 into opencv:3.4 Oct 7, 2019
@tolysz tolysz deleted the patch-1 branch October 7, 2019 12:06
@alalek alalek mentioned this pull request Oct 9, 2019
Merged
@alalek alalek mentioned this pull request Oct 19, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: build/install category: gpu/cuda (contrib) OpenCV 4.0+: moved to opencv_contrib

Projects

None yet

Milestone

3.4.8

Development

Successfully merging this pull request may close these issues.

3 participants

@tolysz @alalek @opencv-pushbot