From 857cd678ca73f8fb55fc9b5b8c5c612a5294ddf4 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Wed, 27 Sep 2023 15:24:31 -0500 Subject: [PATCH] Fix RMM crash in FileCacheIntegrationSuite with ARENA memory allocator Signed-off-by: Jason Lowe --- .../filecache/FileCacheIntegrationSuite.scala | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/tests/src/test/scala/org/apache/spark/sql/rapids/filecache/FileCacheIntegrationSuite.scala b/tests/src/test/scala/org/apache/spark/sql/rapids/filecache/FileCacheIntegrationSuite.scala index 931e6d95628..97cd4b02277 100644 --- a/tests/src/test/scala/org/apache/spark/sql/rapids/filecache/FileCacheIntegrationSuite.scala +++ b/tests/src/test/scala/org/apache/spark/sql/rapids/filecache/FileCacheIntegrationSuite.scala @@ -16,16 +16,15 @@ package org.apache.spark.sql.rapids.filecache -import com.nvidia.spark.rapids.{RapidsBufferCatalog, RapidsDeviceMemoryStore, SparkQueryCompareTestSuite} +import com.nvidia.spark.rapids.SparkQueryCompareTestSuite import com.nvidia.spark.rapids.shims.GpuBatchScanExec -import org.scalatest.BeforeAndAfterEach import org.apache.spark.SparkConf import org.apache.spark.sql.execution.SparkPlan import org.apache.spark.sql.execution.metric.SQLMetric import org.apache.spark.sql.rapids.GpuFileSourceScanExec -class FileCacheIntegrationSuite extends SparkQueryCompareTestSuite with BeforeAndAfterEach { +class FileCacheIntegrationSuite extends SparkQueryCompareTestSuite { import com.nvidia.spark.rapids.GpuMetric._ private val FILE_SPLITS_PARQUET = "file-splits.parquet" @@ -33,17 +32,6 @@ class FileCacheIntegrationSuite extends SparkQueryCompareTestSuite with BeforeAn private val MAP_OF_STRINGS_PARQUET = "map_of_strings.snappy.parquet" private val SCHEMA_CANT_PRUNE_ORC = "schema-cant-prune.orc" - override def beforeEach(): Unit = { - val deviceStorage = new RapidsDeviceMemoryStore() - val catalog = new RapidsBufferCatalog(deviceStorage) - RapidsBufferCatalog.setDeviceStorage(deviceStorage) - RapidsBufferCatalog.setCatalog(catalog) - } - - override def afterEach(): Unit = { - RapidsBufferCatalog.close() - } - def isFileCacheEnabled(conf: SparkConf): Boolean = { // File cache only supported on Spark 3.2+ assumeSpark320orLater