From f455ed4de243f46ba551489d4b3a64cf7e6b7516 Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@nvidia.com>
Date: Tue, 5 Apr 2022 15:24:29 -0500
Subject: [PATCH 1/2] Statically link the CUDA runtime into a single shared
 library

Signed-off-by: Jason Lowe <jlowe@nvidia.com>
---
 .../build-libcudf.xml => build-libcudf.xml    |   2 +
 pom.xml                                       | 462 +++++++++++++-----
 spark-rapids-cudf/pom.xml                     | 294 -----------
 spark-rapids-jni/pom.xml                      | 211 --------
 .../src => src}/main/cpp/CMakeLists.txt       | 102 +++-
 .../cpp/cmake/Modules/ConfigureCUDA.cmake     |   0
 .../main/cpp/src/RowConversionJni.cpp         |   0
 .../main/cpp/src/emptyfile.cpp                |  22 +-
 .../main/cpp/src/row_conversion.cu            |   0
 .../main/cpp/src/row_conversion.hpp           |   0
 .../spark/rapids/jni/RowConversion.java       |   7 +-
 .../spark/rapids/jni/RowConversionTest.java   |   0
 12 files changed, 418 insertions(+), 682 deletions(-)
 rename spark-rapids-cudf/build-libcudf.xml => build-libcudf.xml (95%)
 delete mode 100755 spark-rapids-cudf/pom.xml
 delete mode 100755 spark-rapids-jni/pom.xml
 rename {spark-rapids-jni/src => src}/main/cpp/CMakeLists.txt (62%)
 rename {spark-rapids-jni/src => src}/main/cpp/cmake/Modules/ConfigureCUDA.cmake (100%)
 rename {spark-rapids-jni/src => src}/main/cpp/src/RowConversionJni.cpp (100%)
 rename spark-rapids-jni/src/main/java/com/nvidia/spark/rapids/jni/NativeLibraryLoader.java => src/main/cpp/src/emptyfile.cpp (52%)
 rename {spark-rapids-jni/src => src}/main/cpp/src/row_conversion.cu (100%)
 rename {spark-rapids-jni/src => src}/main/cpp/src/row_conversion.hpp (100%)
 rename {spark-rapids-jni/src => src}/main/java/com/nvidia/spark/rapids/jni/RowConversion.java (96%)
 rename {spark-rapids-jni/src => src}/test/java/com/nvidia/spark/rapids/jni/RowConversionTest.java (100%)

diff --git a/spark-rapids-cudf/build-libcudf.xml b/build-libcudf.xml
similarity index 95%
rename from spark-rapids-cudf/build-libcudf.xml
rename to build-libcudf.xml
index 6cd9c11dc2..83991d94c1 100644
--- a/spark-rapids-cudf/build-libcudf.xml
+++ b/build-libcudf.xml
@@ -35,8 +35,10 @@
           executable="cmake"
           if:true="${needConfigure}">
       <arg value="${cudf.path}/cpp"/>
+      <arg value="-DBUILD_SHARED_LIBS=OFF"/>
       <arg value="-DBUILD_TESTS=OFF"/>
       <arg value="-DCMAKE_CUDA_ARCHITECTURES=${GPU_ARCHS}"/>
+      <arg value="-DCUDA_STATIC_RUNTIME=ON"/>
       <arg value="-DCUDF_ENABLE_ARROW_S3=OFF"/>
       <arg value="-DCUDF_USE_ARROW_STATIC=ON"/>
       <arg value="-DPER_THREAD_DEFAULT_STREAM=${PER_THREAD_DEFAULT_STREAM}" />
diff --git a/pom.xml b/pom.xml
index 9040b7cf0f..4aa3e8126b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.nvidia</groupId>
-  <artifactId>spark-rapids-jni-parent</artifactId>
+  <artifactId>spark-rapids-jni</artifactId>
   <version>22.06.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>RAPIDS Accelerator JNI for Apache Spark Root Project</name>
+  <packaging>jar</packaging>
+  <name>RAPIDS Accelerator JNI for Apache Spark</name>
   <description>
-    The root project of native code and CUDA kernels specific to the
-    RAPIDS Accelerator for Apache Spark.
+    Native code and CUDA kernels specific to the RAPIDS Accelerator for Apache Spark
   </description>
   <url>http://github.com/NVIDIA/spark-rapids-jni</url>
 
@@ -85,140 +84,347 @@
     <ai.rapids.cudf.nvtx.enabled>false</ai.rapids.cudf.nvtx.enabled>
     <ai.rapids.refcount.debug>false</ai.rapids.refcount.debug>
     <cuda.version>cuda11</cuda.version>
-    <cudf.tag>49d1cc28648fe676dbddcf27c01939f87122ed8e</cudf.tag>
+    <cudf.path>${project.basedir}/thirdparty/cudf</cudf.path>
     <hadoop.version>3.1.4</hadoop.version>
     <junit.version>5.8.1</junit.version>
+    <libcudf.build.path>${cudf.path}/cpp/build</libcudf.build.path>
+    <libcudf.build.configure>false</libcudf.build.configure>
+    <libcudf.clean.skip>true</libcudf.clean.skip>
+    <libcudfjni.build.path>${project.build.directory}/libcudfjni</libcudfjni.build.path>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <mockito.version>2.25.0</mockito.version>
+    <native.build.path>${project.build.directory}/cmake-build</native.build.path>
     <parquet.version>1.10.0</parquet.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <slf4j.version>1.7.30</slf4j.version>
+    <submodule.check.skip>false</submodule.check.skip>
   </properties>
 
-  <modules>
-    <module>spark-rapids-cudf</module>
-    <module>spark-rapids-jni</module>
-  </modules>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.arrow</groupId>
-        <artifactId>arrow-vector</artifactId>
-        <version>${arrow.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-common</artifactId>
-        <version>${hadoop.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.parquet</groupId>
-        <artifactId>parquet-avro</artifactId>
-        <version>${parquet.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-api</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-params</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>${mockito.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-simple</artifactId>
-        <version>${slf4j.version}</version>
-        <scope>test</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+      <version>${arrow.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.parquet</groupId>
+      <artifactId>parquet-avro</artifactId>
+      <version>${parquet.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>3.0.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-exec-plugin</artifactId>
-          <version>1.6.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.0.2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <!-- downgrade version so symlinks are followed -->
-          <version>2.6</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>3.2.4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.0</version>
-          <configuration>
-            <!-- you can turn this off, by passing -DtrimStackTrace=true when running tests -->
-            <trimStackTrace>false</trimStackTrace>
-            <redirectTestOutputToFile>true</redirectTestOutputToFile>
-            <systemPropertyVariables>
-              <ai.rapids.refcount.debug>${ai.rapids.refcount.debug}</ai.rapids.refcount.debug>
-              <ai.rapids.cudf.nvtx.enabled>${ai.rapids.cudf.nvtx.enabled}</ai.rapids.cudf.nvtx.enabled>
-            </systemPropertyVariables>
-          </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>org.junit.platform</groupId>
-              <artifactId>junit-platform-surefire-provider</artifactId>
-              <version>1.3.2</version>
-            </dependency>
-            <dependency>
-              <groupId>org.junit.jupiter</groupId>
-              <artifactId>junit-jupiter-engine</artifactId>
-              <version>${junit.version}</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>3.2.0</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>submodule check</id>
+            <phase>validate</phase>
+            <configuration>
+              <skip>${submodule.check.skip}</skip>
+              <target>
+                <exec dir="${project.basedir}"
+                      failonerror="true"
+                      executable="${project.basedir}/build/submodule-check">
+                </exec>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>clean libcudf</id>
+            <phase>clean</phase>
+            <configuration>
+              <skip>${libcudf.clean.skip}</skip>
+              <target>
+                <delete dir="${libcudf.build.path}" includeemptydirs="true"/>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>build-libcudf</id>
+            <phase>validate</phase>
+            <configuration>
+              <target>
+                <property name="cudf.path" value="${cudf.path}"/>
+                <property name="libcudf.build.path" value="${libcudf.build.path}"/>
+                <property name="libcudf.build.configure" value="${libcudf.build.configure}"/>
+                <property name="CPP_PARALLEL_LEVEL" value="${CPP_PARALLEL_LEVEL}"/>
+                <property name="GPU_ARCHS" value="${GPU_ARCHS}"/>
+                <property name="PER_THREAD_DEFAULT_STREAM" value="${PER_THREAD_DEFAULT_STREAM}"/>
+                <property name="RMM_LOGGING_LEVEL" value="${RMM_LOGGING_LEVEL}"/>
+                <property name="USE_GDS" value="${USE_GDS}"/>
+                <ant antfile="build-libcudf.xml" target="build-libcudf"/>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>build-libcudfjni</id>
+            <phase>validate</phase>
+            <configuration>
+              <target>
+                <mkdir dir="${libcudfjni.build.path}"/>
+                <exec dir="${libcudfjni.build.path}"
+                      failonerror="true"
+                      executable="cmake">
+                  <env key="CUDF_CPP_BUILD_DIR" value="${libcudf.build.path}"/>
+                  <env key="CUDF_ROOT" value="${cudf.path}"/>
+                  <arg value="${cudf.path}/java/src/main/native"/>
+                  <arg value="-DBUILD_SHARED_LIBS=OFF"/>
+                  <arg value="-DCUDA_STATIC_RUNTIME=ON"/>
+                  <arg value="-DCUDF_JNI_LIBCUDF_STATIC=ON"/>
+                  <arg value="-DGPU_ARCHS=${GPU_ARCHS}"/>
+                  <arg value="-DPER_THREAD_DEFAULT_STREAM=${PER_THREAD_DEFAULT_STREAM}"/>
+                  <arg value="-DRMM_LOGGING_LEVEL=${RMM_LOGGING_LEVEL}"/>
+                  <arg value="-DUSE_GDS=${USE_GDS}"/>
+                </exec>
+                <exec dir="${libcudfjni.build.path}"
+                      failonerror="true"
+                      executable="cmake">
+                  <arg value="--build"/>
+                  <arg value="${libcudfjni.build.path}"/>
+                  <arg value="-j${CPP_PARALLEL_LEVEL}"/>
+                </exec>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>build-sparkrapidsjni</id>
+            <phase>validate</phase>
+            <configuration>
+              <target>
+                <mkdir dir="${native.build.path}"/>
+                <exec dir="${native.build.path}"
+                      failonerror="true"
+                      executable="cmake">
+                  <arg value="${basedir}/src/main/cpp"/>
+                  <arg value="-DCUDA_STATIC_RUNTIME=ON"/>
+                  <arg value="-DGPU_ARCHS=${GPU_ARCHS}"/>
+                  <arg value="-DPER_THREAD_DEFAULT_STREAM=${PER_THREAD_DEFAULT_STREAM}"/>
+                  <arg value="-DRMM_LOGGING_LEVEL=${RMM_LOGGING_LEVEL}"/>
+                  <arg value="-DUSE_GDS=${USE_GDS}"/>
+                </exec>
+                <exec dir="${native.build.path}"
+                      failonerror="true"
+                      executable="cmake">
+                  <arg value="--build"/>
+                  <arg value="${native.build.path}"/>
+                  <arg value="-j${CPP_PARALLEL_LEVEL}"/>
+                </exec>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>build-info</id>
+            <phase>generate-resources</phase>
+            <configuration>
+              <target>
+                <mkdir dir="${project.build.directory}/extra-resources"/>
+                <exec executable="bash"
+                      output="${project.build.directory}/extra-resources/cudf-java-version-info.properties"
+                      failonerror="true">
+                  <arg value="${project.basedir}/build/build-info"/>
+                  <arg value="${project.version}"/>
+                  <arg value="${cudf.path}"/>
+                </exec>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.0</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.0.2</version>
+        <configuration>
+          <classifier>${cuda.version}</classifier>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+            <configuration>
+              <classifier>tests</classifier>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <!-- downgrade version so symlinks are followed -->
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <id>copy-native-libs</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <overwrite>true</overwrite>
+              <outputDirectory>${project.build.outputDirectory}/${os.arch}/${os.name}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${native.build.path}</directory>
+                  <includes>
+                    <include>libcudf.so</include>
+                    <include>libcudfjni.so</include>
+                    <include>libcufilejni.so</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.4</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.22.0</version>
+        <configuration>
+          <!-- you can turn this off, by passing -DtrimStackTrace=true when running tests -->
+          <trimStackTrace>false</trimStackTrace>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <systemPropertyVariables>
+            <ai.rapids.refcount.debug>${ai.rapids.refcount.debug}</ai.rapids.refcount.debug>
+            <ai.rapids.cudf.nvtx.enabled>${ai.rapids.cudf.nvtx.enabled}</ai.rapids.cudf.nvtx.enabled>
+          </systemPropertyVariables>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-surefire-provider</artifactId>
+            <version>1.3.2</version>
+          </dependency>
+          <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.2.0</version>
+        <executions>
+          <execution>
+            <id>add-cudf-src</id>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <phase>generate-sources</phase>
+            <configuration>
+              <sources>
+                <source>${cudf.path}/java/src/main/java</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-cudf-test-src</id>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <phase>generate-test-sources</phase>
+            <configuration>
+              <sources>
+                <source>${cudf.path}/java/src/test/java</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-cudf-test-resource</id>
+            <goals>
+              <goal>add-test-resource</goal>
+            </goals>
+            <phase>generate-test-resources</phase>
+            <configuration>
+              <resources>
+                <resource>
+                  <directory>${cudf.path}/java/src/test/resources</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <!-- Include the properties file to provide the build information. -->
+        <directory>${project.build.directory}/extra-resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
   </build>
 </project>
diff --git a/spark-rapids-cudf/pom.xml b/spark-rapids-cudf/pom.xml
deleted file mode 100755
index 6613305ff6..0000000000
--- a/spark-rapids-cudf/pom.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2022, NVIDIA CORPORATION.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.nvidia</groupId>
-    <artifactId>spark-rapids-jni-parent</artifactId>
-    <version>22.06.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>spark-rapids-cudf</artifactId>
-  <version>22.06.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>RAPIDS Accelerator cudf</name>
-  <description>RAPIDS cuDF customized for the RAPIDS Accelerator for Apache Spark</description>
-
-  <properties>
-    <cudf.path>${project.basedir}/../thirdparty/cudf</cudf.path>
-    <libcudf.build.path>${cudf.path}/cpp/build</libcudf.build.path>
-    <libcudf.build.configure>false</libcudf.build.configure>
-    <libcudf.clean.skip>true</libcudf.clean.skip>
-    <libcudfjni.build.path>${project.build.directory}/cmake-build</libcudfjni.build.path>
-    <submodule.check.skip>false</submodule.check.skip>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.arrow</groupId>
-      <artifactId>arrow-vector</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.parquet</groupId>
-      <artifactId>parquet-avro</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>submodule check</id>
-            <phase>validate</phase>
-            <configuration>
-              <skip>${submodule.check.skip}</skip>
-              <target>
-                <exec dir="${project.basedir}/.."
-                      failonerror="true"
-                      executable="${project.basedir}/../build/submodule-check">
-                </exec>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>clean libcudf</id>
-            <phase>clean</phase>
-            <configuration>
-              <skip>${libcudf.clean.skip}</skip>
-              <target>
-                <delete dir="${libcudf.build.path}" includeemptydirs="true"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>build libcudf</id>
-            <phase>validate</phase>
-            <configuration>
-              <target>
-                <property name="cudf.path" value="${cudf.path}"/>
-                <property name="libcudf.build.path" value="${libcudf.build.path}"/>
-                <property name="libcudf.build.configure" value="${libcudf.build.configure}"/>
-                <property name="CPP_PARALLEL_LEVEL" value="${CPP_PARALLEL_LEVEL}"/>
-                <property name="GPU_ARCHS" value="${GPU_ARCHS}"/>
-                <property name="PER_THREAD_DEFAULT_STREAM" value="${PER_THREAD_DEFAULT_STREAM}"/>
-                <property name="RMM_LOGGING_LEVEL" value="${RMM_LOGGING_LEVEL}"/>
-                <property name="USE_GDS" value="${USE_GDS}"/>
-                <ant antfile="build-libcudf.xml" target="build-libcudf"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>build libcudfjni</id>
-            <phase>validate</phase>
-            <configuration>
-              <target>
-                <mkdir dir="${libcudfjni.build.path}"/>
-                <exec dir="${libcudfjni.build.path}"
-                      failonerror="true"
-                      executable="cmake">
-                  <env key="CUDF_CPP_BUILD_DIR" value="${libcudf.build.path}"/>
-                  <env key="CUDF_ROOT" value="${cudf.path}"/>
-                  <arg value="${cudf.path}/java/src/main/native"/>
-                  <arg value="-DGPU_ARCHS=${GPU_ARCHS}"/>
-                  <arg value="-DPER_THREAD_DEFAULT_STREAM=${PER_THREAD_DEFAULT_STREAM}"/>
-                  <arg value="-DRMM_LOGGING_LEVEL=${RMM_LOGGING_LEVEL}"/>
-                  <arg value="-DUSE_GDS=${USE_GDS}"/>
-                </exec>
-                <exec dir="${libcudfjni.build.path}"
-                      failonerror="true"
-                      executable="cmake">
-                  <arg value="--build"/>
-                  <arg value="${libcudfjni.build.path}"/>
-                  <arg value="-j${CPP_PARALLEL_LEVEL}"/>
-                </exec>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>build-info</id>
-            <phase>generate-resources</phase>
-            <configuration>
-              <target>
-                <mkdir dir="${project.build.directory}/extra-resources"/>
-                <exec executable="bash"
-                      output="${project.build.directory}/extra-resources/cudf-java-version-info.properties"
-                      failonerror="true">
-                  <arg value="${project.basedir}/../build/build-info"/>
-                  <arg value="${project.version}"/>
-                  <arg value="${cudf.path}"/>
-                </exec>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-cudf-src</id>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <sources>
-                <source>${cudf.path}/java/src/main/java</source>
-              </sources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add-cudf-test-src</id>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <phase>generate-test-sources</phase>
-            <configuration>
-              <sources>
-                <source>${cudf.path}/java/src/test/java</source>
-              </sources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add-cudf-test-resource</id>
-            <goals>
-              <goal>add-test-resource</goal>
-            </goals>
-            <phase>generate-test-resources</phase>
-            <configuration>
-              <resources>
-                <resource>
-                  <directory>${cudf.path}/java/src/test/resources</directory>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <classifier>${cuda.version}</classifier>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-            <configuration>
-              <classifier>tests</classifier>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-native-libs</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <overwrite>true</overwrite>
-              <outputDirectory>${project.build.outputDirectory}/${os.arch}/${os.name}</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${libcudf.build.path}</directory>
-                  <includes>
-                    <include>libcudf.so</include>
-                  </includes>
-                </resource>
-                <resource>
-                  <directory>${libcudfjni.build.path}</directory>
-                  <includes>
-                    <include>libcudfjni.so</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </plugin>
-    </plugins>
-    <resources>
-      <resource>
-        <!-- Include the properties file to provide the build information. -->
-        <directory>${project.build.directory}/extra-resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-  </build>
-</project>
diff --git a/spark-rapids-jni/pom.xml b/spark-rapids-jni/pom.xml
deleted file mode 100755
index a64f82b65c..0000000000
--- a/spark-rapids-jni/pom.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2022, NVIDIA CORPORATION.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.nvidia</groupId>
-    <artifactId>spark-rapids-jni-parent</artifactId>
-    <version>22.06.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>rapids-4-spark-jni</artifactId>
-  <version>22.06.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>RAPIDS Accelerator JNI for Apache Spark</name>
-  <description>
-    Native code and CUDA kernels specific to the RAPIDS Accelerator for Apache Spark
-  </description>
-
-  <properties>
-    <native.build.path>${project.build.directory}/cmake-build</native.build.path>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.nvidia</groupId>
-      <artifactId>spark-rapids-cudf</artifactId>
-      <version>${project.version}</version>
-      <classifier>${cuda.version}</classifier>
-    </dependency>
-    <dependency>
-      <groupId>com.nvidia</groupId>
-      <artifactId>spark-rapids-cudf</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>cmake</id>
-            <phase>validate</phase>
-            <configuration>
-              <target>
-                <mkdir dir="${native.build.path}"/>
-                <exec dir="${native.build.path}"
-                      failonerror="true"
-                      executable="cmake">
-                  <arg value="${basedir}/src/main/cpp"/>
-                  <arg value="-DGPU_ARCHS=${GPU_ARCHS}"/>
-                  <arg value="-DPER_THREAD_DEFAULT_STREAM=${PER_THREAD_DEFAULT_STREAM}"/>
-                  <arg value="-DRMM_LOGGING_LEVEL=${RMM_LOGGING_LEVEL}"/>
-                </exec>
-                <exec dir="${native.build.path}"
-                      failonerror="true"
-                      executable="make">
-                  <arg value="-j"/>
-                </exec>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>build-info</id>
-            <phase>generate-resources</phase>
-            <configuration>
-              <target>
-                <mkdir dir="${project.build.directory}/extra-resources"/>
-                <exec executable="bash"
-                      output="${project.build.directory}/extra-resources/spark-rapids-jni-version-info.properties"
-                      failonerror="true">
-                  <arg value="${project.basedir}/../build/build-info"/>
-                  <arg value="${project.version}"/>
-                  <arg value="${project.basedir}"/>
-                </exec>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>classifier-jar</id>
-            <configuration>
-              <classifier>${cuda.version}</classifier>
-            </configuration>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-jar</id>
-            <configuration>
-              <classifier>tests</classifier>
-            </configuration>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <configuration>
-          <artifactSet>
-            <includes>
-              <include>com.nvidia:spark-rapids-cudf:${cuda.version}</include>
-            </includes>
-          </artifactSet>
-          <filters>
-            <filter>
-              <artifact>com.nvidia:spark-rapids-cudf:${cuda.version}</artifact>
-              <excludes>
-                <exclude>META-INF/*.MF</exclude>
-              </excludes>
-            </filter>
-          </filters>
-          <shadedArtifactAttached>true</shadedArtifactAttached>
-          <shadedClassifierName>${cuda.version}</shadedClassifierName>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-native-libs</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <overwrite>true</overwrite>
-              <outputDirectory>${project.build.directory}/native-deps/${os.arch}/${os.name}</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${native.build.path}</directory>
-                  <includes>
-                    <include>libspark_rapids_jni.so</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <resources>
-      <resource>
-        <directory>${basedir}/..</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>LICENSE</include>
-        </includes>
-      </resource>
-      <resource>
-        <!-- Include the properties file to provide the build information. -->
-        <directory>${project.build.directory}/extra-resources</directory>
-        <filtering>true</filtering>
-      </resource>
-      <resource>
-        <directory>${project.build.directory}/native-deps/</directory>
-      </resource>
-    </resources>
-  </build>
-</project>
diff --git a/spark-rapids-jni/src/main/cpp/CMakeLists.txt b/src/main/cpp/CMakeLists.txt
similarity index 62%
rename from spark-rapids-jni/src/main/cpp/CMakeLists.txt
rename to src/main/cpp/CMakeLists.txt
index 98dcd2b7d1..a189198a3f 100644
--- a/spark-rapids-jni/src/main/cpp/CMakeLists.txt
+++ b/src/main/cpp/CMakeLists.txt
@@ -24,6 +24,8 @@ include(rapids-cpm)
 include(rapids-cuda)
 include(rapids-export)
 include(rapids-find)
+include(rapids-cpm)
+rapids_cpm_init()
 
 # Use GPU_ARCHS if it is defined
 if(DEFINED GPU_ARCHS)
@@ -42,6 +44,7 @@ project(
 # * build options ---------------------------------------------------------------------------------
 
 option(PER_THREAD_DEFAULT_STREAM "Build with per-thread default stream" ON)
+option(USE_GDS "Build with GPUDirect Storage (GDS)/cuFile support" OFF)
 
 message(VERBOSE "SPARK_RAPIDS_JNI: Build with per-thread default stream: ${PER_THREAD_DEFAULT_STREAM}")
 
@@ -61,7 +64,7 @@ set_property(
 message(VERBOSE "SPARK_RAPIDS_JNI: RMM_LOGGING_LEVEL = '${RMM_LOGGING_LEVEL}'.")
 
 set(CUDF_DIR
-  "${PROJECT_BINARY_DIR}/../../../thirdparty/cudf"
+  "${PROJECT_BINARY_DIR}/../../thirdparty/cudf"
   CACHE STRING "path to cudf repository"
 )
 
@@ -85,38 +88,49 @@ else()
 endif()
 
 # cudf
-set(CUDF_DEPS_DIR "${CUDF_DIR}/cpp/build/_deps")
+set(CUDF_BUILD_DIR "${CUDF_DIR}/cpp/build")
+set(CUDF_DEPS_DIR "${CUDF_BUILD_DIR}/_deps")
 set(CUDF_INCLUDE_DIRS
   "${CUDF_DIR}/cpp/include"
   "${CUDF_DIR}/java/src/main/native/include"
   "${CUDF_DIR}/java/src/main/native/src"
   "${CUDF_DEPS_DIR}/arrow-src/cpp/src"
   "${CUDF_DEPS_DIR}/nvcomp-src/include"
-  "${CUDF_DEPS_DIR}/thrust-src"
 )
 
+# Thrust
+include(${CUDF_DIR}/cpp/cmake/thirdparty/get_thrust.cmake)
+
 # RMM
-find_path(
-  RMM_INCLUDE "rmm"
-  HINTS "${CUDF_DEPS_DIR}/rmm-src/include"
-        "$ENV{RMM_ROOT}/include"
-        "$ENV{RMM_HOME}/include"
-        "$ENV{CONDA_PREFIX}/include"
-)
+include(${CUDF_DIR}/cpp/cmake/thirdparty/get_rmm.cmake)
 
-find_path(
-  SPDLOG_INCLUDE "spdlog"
-  HINTS "${CUDF_DEPS_DIR}/spdlog-src/include"
-        "$ENV{RMM_ROOT}/_deps/spdlog-src/include"
-        "$ENV{RMM_ROOT}/include"
-        "$ENV{CONDA_PREFIX}/include"
+# Arrow
+find_library(ARROW_LIB "libarrow.a" REQUIRED
+  HINTS "${CUDF_DEPS_DIR}/arrow-build/release"
+        "${CUDF_DEPS_DIR}/arrow-build/debug"
 )
 
+# cudf
+find_library(CUDF_LIB "cudf" REQUIRED HINTS ${CUDF_BUILD_DIR})
+
 # cudfjni
-find_library(CUDFJNI_LIB "cudfjni" REQUIRED
-  HINTS "${PROJECT_BINARY_DIR}/../../../spark-rapids-cudf/target/cmake-build"
+find_library(CUDFJNI_LIB "libcudfjni.a" REQUIRED
+  HINTS "${PROJECT_BINARY_DIR}/../libcudfjni"
 )
 
+# ZLIB
+rapids_find_package(ZLIB REQUIRED)
+
+# ##################################################################################################
+# * nvcomp ----------------------------------------------------------------------------------------
+
+find_path(NVCOMP_INCLUDE "nvcomp" HINTS "${CUDF_BUILD_DIR}/_deps/nvcomp-src/include")
+
+message(STATUS "NVCOMP: NVCOMP_INCLUDE set to ${NVCOMP_INCLUDE}")
+
+set(NVCOMP_LIBNAME "libnvcomp.a")
+find_library(NVCOMP_LIB "libnvcomp.a" REQUIRED HINTS "${CUDF_BUILD_DIR}/lib")
+
 # ##################################################################################################
 # * library targets -------------------------------------------------------------------------------
 
@@ -137,6 +151,7 @@ set_target_properties(
              CUDA_STANDARD_REQUIRED ON
              POSITION_INDEPENDENT_CODE ON
              INTERFACE_POSITION_INDEPENDENT_CODE ON
+             CUDA_RUNTIME_LIBRARY Static
 )
 
 target_compile_options(
@@ -147,10 +162,10 @@ target_compile_options(
 # Specify include paths for the current target and dependents
 target_include_directories(
   spark_rapids_jni
-  PRIVATE "${SPARK_RAPIDS_JNI_SOURCE_DIR}/src"
+  PRIVATE cudf::Thrust
+          "${NVCOMP_INCLUDE}"
+          "${SPARK_RAPIDS_JNI_SOURCE_DIR}/src"
           "${CUDF_INCLUDE_DIRS}"
-          "${RMM_INCLUDE}"
-          "${SPDLOG_INCLUDE}"
           "${JNI_INCLUDE_DIRS}"
           "${CUDAToolkit_INCLUDE_DIRS}"
 )
@@ -166,6 +181,47 @@ if(PER_THREAD_DEFAULT_STREAM)
 endif()
 
 target_link_libraries(
-  spark_rapids_jni
-  PRIVATE ${CUDFJNI_LIB}
+  spark_rapids_jni PRIVATE
+  -Wl,--whole-archive
+    ${CUDFJNI_LIB}
+    ${CUDF_LIB}
+  -Wl,--no-whole-archive
+  rmm::rmm
+  ${ARROW_LIB}
+  ${NVCOMP_LIB}
+  ZLIB::ZLIB
+  CUDA::cuda_driver
 )
+
+# For backwards-compatibility with the cudf Java bindings and RAPIDS accelerated UDFs,
+# all of the code is built into libcudf.so that is statically linked to the CUDA runtime library.
+# libcudfjni.so is a stub library dynamically-linked to libcudf.so.
+set_target_properties(spark_rapids_jni PROPERTIES OUTPUT_NAME "cudf")
+add_library(cudfjnistub SHARED src/emptyfile.cpp)
+set_target_properties(cudfjnistub PROPERTIES OUTPUT_NAME "cudfjni")
+target_link_libraries(cudfjnistub -Wl,--no-as-needed spark_rapids_jni -Wl,--as-needed)
+
+# ##################################################################################################
+# * cuFile JNI -------------------------------------------------------------------------------------
+
+if(USE_GDS)
+  include(${CUDF_DIR}/cpp/cmake/Modules/FindcuFile.cmake)
+  find_library(CUFILEJNI_LIB "libcufilejni.a" REQUIRED HINTS "${PROJECT_BINARY_DIR}/../libcudfjni")
+  add_library(cufilejni SHARED src/emptyfile.cpp)
+  set_target_properties(
+    cufilejni
+    PROPERTIES BUILD_RPATH "\$ORIGIN"
+               INSTALL_RPATH "\$ORIGIN"
+               # set target compile options
+               CXX_STANDARD 17
+               CXX_STANDARD_REQUIRED ON
+  )
+  target_link_libraries(
+    cufilejni PRIVATE
+    -Wl,--whole-archive
+      ${CUFILEJNI_LIB}
+    -Wl,--no-whole-archive
+    spark_rapids_jni
+    ${cuFile_LIBRARIES}
+  )
+endif()
diff --git a/spark-rapids-jni/src/main/cpp/cmake/Modules/ConfigureCUDA.cmake b/src/main/cpp/cmake/Modules/ConfigureCUDA.cmake
similarity index 100%
rename from spark-rapids-jni/src/main/cpp/cmake/Modules/ConfigureCUDA.cmake
rename to src/main/cpp/cmake/Modules/ConfigureCUDA.cmake
diff --git a/spark-rapids-jni/src/main/cpp/src/RowConversionJni.cpp b/src/main/cpp/src/RowConversionJni.cpp
similarity index 100%
rename from spark-rapids-jni/src/main/cpp/src/RowConversionJni.cpp
rename to src/main/cpp/src/RowConversionJni.cpp
diff --git a/spark-rapids-jni/src/main/java/com/nvidia/spark/rapids/jni/NativeLibraryLoader.java b/src/main/cpp/src/emptyfile.cpp
similarity index 52%
rename from spark-rapids-jni/src/main/java/com/nvidia/spark/rapids/jni/NativeLibraryLoader.java
rename to src/main/cpp/src/emptyfile.cpp
index 2107412bf1..d7777f83dc 100644
--- a/spark-rapids-jni/src/main/java/com/nvidia/spark/rapids/jni/NativeLibraryLoader.java
+++ b/src/main/cpp/src/emptyfile.cpp
@@ -14,24 +14,4 @@
  * limitations under the License.
  */
 
-package com.nvidia.spark.rapids.jni;
-
-import ai.rapids.cudf.NativeDepsLoader;
-
-/** Loads the native libraries */
-public class NativeLibraryLoader {
-  private static boolean loaded = false;
-
-  /** Load native libraries if not loaded already */
-  public static synchronized void loadNativeLibs() {
-    if (!loaded) {
-      try {
-        NativeDepsLoader.loadNativeDeps();
-        NativeDepsLoader.loadNativeDeps(new String[]{"spark_rapids_jni"});
-        loaded = true;
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-}
+// Intentionally empty
diff --git a/spark-rapids-jni/src/main/cpp/src/row_conversion.cu b/src/main/cpp/src/row_conversion.cu
similarity index 100%
rename from spark-rapids-jni/src/main/cpp/src/row_conversion.cu
rename to src/main/cpp/src/row_conversion.cu
diff --git a/spark-rapids-jni/src/main/cpp/src/row_conversion.hpp b/src/main/cpp/src/row_conversion.hpp
similarity index 100%
rename from spark-rapids-jni/src/main/cpp/src/row_conversion.hpp
rename to src/main/cpp/src/row_conversion.hpp
diff --git a/spark-rapids-jni/src/main/java/com/nvidia/spark/rapids/jni/RowConversion.java b/src/main/java/com/nvidia/spark/rapids/jni/RowConversion.java
similarity index 96%
rename from spark-rapids-jni/src/main/java/com/nvidia/spark/rapids/jni/RowConversion.java
rename to src/main/java/com/nvidia/spark/rapids/jni/RowConversion.java
index 854b089517..5c254b2a10 100644
--- a/spark-rapids-jni/src/main/java/com/nvidia/spark/rapids/jni/RowConversion.java
+++ b/src/main/java/com/nvidia/spark/rapids/jni/RowConversion.java
@@ -16,15 +16,12 @@
 
 package com.nvidia.spark.rapids.jni;
 
-import ai.rapids.cudf.ColumnView;
-import ai.rapids.cudf.ColumnVector;
-import ai.rapids.cudf.DType;
-import ai.rapids.cudf.Table;
+import ai.rapids.cudf.*;
 
 /** Utility class for converting between column major and row major data */
 public class RowConversion {
   static {
-    NativeLibraryLoader.loadNativeLibs();
+    NativeDepsLoader.loadNativeDeps();
   }
 
   /**
diff --git a/spark-rapids-jni/src/test/java/com/nvidia/spark/rapids/jni/RowConversionTest.java b/src/test/java/com/nvidia/spark/rapids/jni/RowConversionTest.java
similarity index 100%
rename from spark-rapids-jni/src/test/java/com/nvidia/spark/rapids/jni/RowConversionTest.java
rename to src/test/java/com/nvidia/spark/rapids/jni/RowConversionTest.java

From 830d55c9f0b1ac2b6c525193decd0af294f6e155 Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@nvidia.com>
Date: Fri, 8 Apr 2022 17:29:31 -0500
Subject: [PATCH 2/2] Pickup libcudf and its dependencies via
 rapids_find_package

---
 build-libcudf.xml           |  4 ++-
 pom.xml                     |  3 +-
 src/main/cpp/CMakeLists.txt | 70 +++++++++++--------------------------
 3 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/build-libcudf.xml b/build-libcudf.xml
index 83991d94c1..1be5d49c84 100644
--- a/build-libcudf.xml
+++ b/build-libcudf.xml
@@ -29,6 +29,7 @@
       </or>
     </condition>
 
+    <mkdir dir="${libcudf.install.path}"/>
     <mkdir dir="${libcudf.build.path}"/>
     <exec dir="${libcudf.build.path}"
           failonerror="true"
@@ -38,6 +39,7 @@
       <arg value="-DBUILD_SHARED_LIBS=OFF"/>
       <arg value="-DBUILD_TESTS=OFF"/>
       <arg value="-DCMAKE_CUDA_ARCHITECTURES=${GPU_ARCHS}"/>
+      <arg value="-DCMAKE_INSTALL_PREFIX=${libcudf.install.path}"/>
       <arg value="-DCUDA_STATIC_RUNTIME=ON"/>
       <arg value="-DCUDF_ENABLE_ARROW_S3=OFF"/>
       <arg value="-DCUDF_USE_ARROW_STATIC=ON"/>
@@ -52,7 +54,7 @@
       <arg value="--build"/>
       <arg value="${libcudf.build.path}"/>
       <arg value="--target"/>
-      <arg value="cudf"/>
+      <arg value="install"/>
       <arg value="-j${CPP_PARALLEL_LEVEL}"/>
     </exec>
   </target>
diff --git a/pom.xml b/pom.xml
index 4aa3e8126b..540d79f4c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,7 @@
     <libcudf.build.path>${cudf.path}/cpp/build</libcudf.build.path>
     <libcudf.build.configure>false</libcudf.build.configure>
     <libcudf.clean.skip>true</libcudf.clean.skip>
+    <libcudf.install.path>${project.build.directory}/libcudf-install</libcudf.install.path>
     <libcudfjni.build.path>${project.build.directory}/libcudfjni</libcudfjni.build.path>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -195,6 +196,7 @@
                 <property name="cudf.path" value="${cudf.path}"/>
                 <property name="libcudf.build.path" value="${libcudf.build.path}"/>
                 <property name="libcudf.build.configure" value="${libcudf.build.configure}"/>
+                <property name="libcudf.install.path" value="${libcudf.install.path}"/>
                 <property name="CPP_PARALLEL_LEVEL" value="${CPP_PARALLEL_LEVEL}"/>
                 <property name="GPU_ARCHS" value="${GPU_ARCHS}"/>
                 <property name="PER_THREAD_DEFAULT_STREAM" value="${PER_THREAD_DEFAULT_STREAM}"/>
@@ -250,7 +252,6 @@
                       failonerror="true"
                       executable="cmake">
                   <arg value="${basedir}/src/main/cpp"/>
-                  <arg value="-DCUDA_STATIC_RUNTIME=ON"/>
                   <arg value="-DGPU_ARCHS=${GPU_ARCHS}"/>
                   <arg value="-DPER_THREAD_DEFAULT_STREAM=${PER_THREAD_DEFAULT_STREAM}"/>
                   <arg value="-DRMM_LOGGING_LEVEL=${RMM_LOGGING_LEVEL}"/>
diff --git a/src/main/cpp/CMakeLists.txt b/src/main/cpp/CMakeLists.txt
index a189198a3f..c6d88aefcd 100644
--- a/src/main/cpp/CMakeLists.txt
+++ b/src/main/cpp/CMakeLists.txt
@@ -36,7 +36,7 @@ rapids_cuda_init_architectures(SPARK_RAPIDS_JNI)
 
 project(
   SPARK_RAPIDS_JNI
-  VERSION 21.12.00
+  VERSION 22.06.00
   LANGUAGES C CXX CUDA
 )
 
@@ -63,6 +63,13 @@ set_property(
 )
 message(VERBOSE "SPARK_RAPIDS_JNI: RMM_LOGGING_LEVEL = '${RMM_LOGGING_LEVEL}'.")
 
+set(CUDF_INSTALL_DIR
+  "${PROJECT_BINARY_DIR}/../libcudf-install"
+  CACHE STRING "path to libcudf install root"
+)
+
+set(CMAKE_PREFIX_PATH ${CUDF_INSTALL_DIR})
+
 set(CUDF_DIR
   "${PROJECT_BINARY_DIR}/../../thirdparty/cudf"
   CACHE STRING "path to cudf repository"
@@ -88,48 +95,17 @@ else()
 endif()
 
 # cudf
-set(CUDF_BUILD_DIR "${CUDF_DIR}/cpp/build")
-set(CUDF_DEPS_DIR "${CUDF_BUILD_DIR}/_deps")
-set(CUDF_INCLUDE_DIRS
-  "${CUDF_DIR}/cpp/include"
-  "${CUDF_DIR}/java/src/main/native/include"
-  "${CUDF_DIR}/java/src/main/native/src"
-  "${CUDF_DEPS_DIR}/arrow-src/cpp/src"
-  "${CUDF_DEPS_DIR}/nvcomp-src/include"
-)
-
-# Thrust
-include(${CUDF_DIR}/cpp/cmake/thirdparty/get_thrust.cmake)
-
-# RMM
-include(${CUDF_DIR}/cpp/cmake/thirdparty/get_rmm.cmake)
-
-# Arrow
-find_library(ARROW_LIB "libarrow.a" REQUIRED
-  HINTS "${CUDF_DEPS_DIR}/arrow-build/release"
-        "${CUDF_DEPS_DIR}/arrow-build/debug"
-)
-
-# cudf
-find_library(CUDF_LIB "cudf" REQUIRED HINTS ${CUDF_BUILD_DIR})
+rapids_find_package(cudf REQUIRED)
 
 # cudfjni
-find_library(CUDFJNI_LIB "libcudfjni.a" REQUIRED
+find_library(CUDFJNI_LIB "libcudfjni.a" REQUIRED NO_DEFAULT_PATH
   HINTS "${PROJECT_BINARY_DIR}/../libcudfjni"
 )
 
-# ZLIB
-rapids_find_package(ZLIB REQUIRED)
-
-# ##################################################################################################
-# * nvcomp ----------------------------------------------------------------------------------------
-
-find_path(NVCOMP_INCLUDE "nvcomp" HINTS "${CUDF_BUILD_DIR}/_deps/nvcomp-src/include")
-
-message(STATUS "NVCOMP: NVCOMP_INCLUDE set to ${NVCOMP_INCLUDE}")
-
-set(NVCOMP_LIBNAME "libnvcomp.a")
-find_library(NVCOMP_LIB "libnvcomp.a" REQUIRED HINTS "${CUDF_BUILD_DIR}/lib")
+set(CUDFJNI_INCLUDE_DIRS
+  "${CUDF_DIR}/java/src/main/native/include"
+  "${CUDF_DIR}/java/src/main/native/src"
+)
 
 # ##################################################################################################
 # * library targets -------------------------------------------------------------------------------
@@ -162,11 +138,9 @@ target_compile_options(
 # Specify include paths for the current target and dependents
 target_include_directories(
   spark_rapids_jni
-  PRIVATE cudf::Thrust
-          "${NVCOMP_INCLUDE}"
-          "${SPARK_RAPIDS_JNI_SOURCE_DIR}/src"
-          "${CUDF_INCLUDE_DIRS}"
+  PRIVATE "${SPARK_RAPIDS_JNI_SOURCE_DIR}/src"
           "${JNI_INCLUDE_DIRS}"
+          "${CUDFJNI_INCLUDE_DIRS}"
           "${CUDAToolkit_INCLUDE_DIRS}"
 )
 
@@ -184,13 +158,9 @@ target_link_libraries(
   spark_rapids_jni PRIVATE
   -Wl,--whole-archive
     ${CUDFJNI_LIB}
-    ${CUDF_LIB}
+    cudf::cudf
   -Wl,--no-whole-archive
-  rmm::rmm
-  ${ARROW_LIB}
-  ${NVCOMP_LIB}
-  ZLIB::ZLIB
-  CUDA::cuda_driver
+  cudf::cudf
 )
 
 # For backwards-compatibility with the cudf Java bindings and RAPIDS accelerated UDFs,
@@ -206,7 +176,9 @@ target_link_libraries(cudfjnistub -Wl,--no-as-needed spark_rapids_jni -Wl,--as-n
 
 if(USE_GDS)
   include(${CUDF_DIR}/cpp/cmake/Modules/FindcuFile.cmake)
-  find_library(CUFILEJNI_LIB "libcufilejni.a" REQUIRED HINTS "${PROJECT_BINARY_DIR}/../libcudfjni")
+  find_library(CUFILEJNI_LIB "libcufilejni.a" REQUIRED NO_DEFAULT_PATH
+    HINTS "${PROJECT_BINARY_DIR}/../libcudfjni"
+  )
   add_library(cufilejni SHARED src/emptyfile.cpp)
   set_target_properties(
     cufilejni