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

[auto-merge] branch-0.2 to branch-0.3 - resolve conflict #738

Merged
merged 3 commits into from
Sep 11, 2020

Conversation

tgravescs
Copy link
Collaborator

Fix the conflicts in #736

2 conflicts were jenkins/spark-premerge-build.sh where the profile to include-databricks was removed and then other was in GpuCoalesceBatches where we changed the collect time metrics and the variable hasOnDeck changed names

firestarman and others added 3 commits September 11, 2020 11:14
Add support to run Pandas UDFs on GPUs, mainly consisting of two things:

Overriding all the 6 related plans to build GPU context of device and memory for Python processes.
Introducing 2 new python modules rapids.worker and rapids.daemon to execute the GPU memory initialization by leveraging RMM Python APIs.

Signed-off-by: Firestarman <firestarmanllc@gmail.com>

Co-authored-by: Liangcai Li <liangcail@nvidia.com>
Co-authored-by: Robert (Bobby) Evans <bobby@apache.org>
Co-authored-by: shotai <gamem.8818@gmail.com>
* Fix collect time in CoalesceBatches

* Also move totalTime

* switch to use if !isdefined

Signed-off-by: Thomas Graves <tgraves@apache.org>

* remove extra newline

Signed-off-by: Thomas Graves <tgraves@apache.org>
@tgravescs tgravescs changed the base branch from branch-0.2 to branch-0.3 September 11, 2020 14:11
@tgravescs
Copy link
Collaborator Author

build

@jlowe jlowe added the build Related to CI / CD or cleanly building label Sep 11, 2020
@revans2
Copy link
Collaborator

revans2 commented Sep 11, 2020

The newly added tests are failing for this in a way that looks like the python files in the jar were not added to the python path.

@tgravescs
Copy link
Collaborator Author

I'm going to go ahead and merge this.

@jlowe
Copy link
Member

jlowe commented Sep 11, 2020

Note there are new changes on branch-0.2 that are not covered by this.

@jlowe
Copy link
Member

jlowe commented Sep 11, 2020

Also remember to NOT squash this commit, must be a merge commit.

@tgravescs tgravescs merged commit 8b304bd into NVIDIA:branch-0.3 Sep 11, 2020
@tgravescs
Copy link
Collaborator Author

@GaryShen2008 @NvTimLiu @pxLi could you take a look at these test failures, is there something setup different in the 0.3 env?

@tgravescs tgravescs deleted the resolvconf branch September 11, 2020 15:36
@pxLi
Copy link
Collaborator

pxLi commented Sep 12, 2020

@GaryShen2008 @NvTimLiu @pxLi could you take a look at these test failures, is there something setup different in the 0.3 env?

@tgravescs nothing different here for 0.3. we are seeing periodically failures should be related recent-merged python udf_test.
I saw @revans2 got this one #747, but there are still some udf tests are not marked as skip and could fail the test.

image

nartal1 pushed a commit to nartal1/spark-rapids that referenced this pull request Jun 9, 2021
[auto-merge] branch-0.2 to branch-0.3 - resolve conflict
nartal1 pushed a commit to nartal1/spark-rapids that referenced this pull request Jun 9, 2021
[auto-merge] branch-0.2 to branch-0.3 - resolve conflict
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to CI / CD or cleanly building
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants