From e259b4d306bbe01368f8c900f2412906b7be9d91 Mon Sep 17 00:00:00 2001
From: dding3 <ding.ding@intel.com>
Date: Tue, 24 Aug 2021 18:31:16 -0700
Subject: [PATCH] resolve upstream_bigdl-2.0 conflicts