Squashed 'data_analytics' changes from e4b53b4..4f3b370 (#645)

4f3b370 Merge pull request Xilinx#361 from shengl/next ce09533 Update description.json 99748dc Merge pull request #2 from FaaSApps/next 00af52b Merge pull request Xilinx#358 from Zhenhong/next a27dc9c fix doc issue 1881407 Merge pull request Xilinx#357 from sibow/fix_conflict 6a2a29a Merge branch 'next' into fix_conflict de7d61c fix link error a2e0650 fix allowlist (Xilinx#355) 8abe0ff Merge pull request Xilinx#354 from shengl/next-tutorial 94b6199 update image Co-authored-by: sdausr <[email protected]>
CRTejaswi · Apr 27, 2022 · 6b2ef24 · 6b2ef24
1 parent 6daf535
commit 6b2ef24
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 16 deletions.
diff --git a/data_analytics/L2/demos/text/log_analyzer/description.json b/data_analytics/L2/demos/text/log_analyzer/description.json
@@ -143,7 +143,6 @@
         "targets": [
             "vitis_sw_emu",
             "vitis_hw_emu",
-            "vitis_hw"
         ],
         "category": "canary"
     }

diff --git a/data_analytics/L2/tests/classification/decisiontree/description.json b/data_analytics/L2/tests/classification/decisiontree/description.json
@@ -4,9 +4,7 @@
     "description": "", 
     "flow": "vitis", 
     "platform_allowlist": [
-        "u250", 
-        "u50", 
-        "aws-vu9p-f1"
+        "u250"
     ], 
     "platform_blocklist": [], 
     "platform_properties": {

diff --git a/data_analytics/L2/tests/classification/svm/description.json b/data_analytics/L2/tests/classification/svm/description.json
@@ -4,8 +4,7 @@
     "description": "",
     "flow": "vitis",
     "platform_allowlist": [
-        "u250",
-        "u50"
+        "u250"
     ],
     "platform_blocklist": [
         "aws-vu9p-f1"
@@ -155,4 +154,4 @@
         ],
         "category": "canary"
     }
-}
+}
diff --git a/data_analytics/L2/tests/geospatial/knn_sc/description.json b/data_analytics/L2/tests/geospatial/knn_sc/description.json
@@ -10,12 +10,10 @@
         "zc"
     ], 
     "platform_properties": {
-        "xilinx_u2_gen3x4_xdma_gc_2_202110_1": {
+        "u50": {
             "v++": {
                 "compiler": {
-                    "clflags": [
-                        "-DUSE_U2"
-                    ]
+                    "clflags": []
                 }
             }
         }

diff --git a/data_analytics/docs/guide_L1/internals/csvParser.rst b/data_analytics/docs/guide_L1/internals/csvParser.rst
@@ -29,6 +29,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+.. _guide-csv-parser:
+
 ******************************
 CSV Parser
 ******************************

diff --git a/data_analytics/docs/guide_L2/internals/GeoSpatialKNN.rst b/data_analytics/docs/guide_L2/internals/GeoSpatialKNN.rst
@@ -36,10 +36,9 @@ The overall diagram of KNN kernel is shown in the figure below:
 
 Building Blocks:
 
-- `CSV Parser(DataAnalytic Library L1 Primitive) <https://xilinx.github.io/Vitis_Libraries/graph/2022.1/guide_L1/primitives/sortTopK.html>`_: parse input csv file according to schema configurations, output spatial object coordinate (x, y) and index.
+- CSV Parser(DataAnalytic Library L1 Primitive) :ref:`guide-csv-parser`: parse input csv file according to schema configurations, output spatial object coordinate (x, y) and index.
 - Distance: compute distance between base location and spatial object location; Euclidean distance is applied.
-- `Sort Top-K(Graph Library L1 Primitive) <https://pages.gitenterprise.xilinx.com/FaaSApps/xf_DataAnalytics/2022.1/guide_L1/internals/csvParser.html>`_: sort distance in ascending order and keep top-k objects.
-
+- `Sort Top-K(Graph Library L1 Primitive) <https://xilinx.github.io/Vitis_Libraries/graph/2021.2/guide_L1/primitives/sortTopK.html>`_ : sort distance in ascending order and keep top-k objects.
 
 End2End Performance
 ===================

diff --git a/data_analytics/docs/images/csv_scanner_card.png b/data_analytics/docs/images/csv_scanner_card.png
diff --git a/data_analytics/docs/tutorial.rst b/data_analytics/docs/tutorial.rst
@@ -81,8 +81,8 @@ Command to Run L3 cases
 
     cd L3/tests/vitis_case_folder
     
-    # build and run one of the following using U2 platform
-    make run TARGET=sw_emu DEVICE=/path/to/xilinx_u2_gen3x4_xdma_gc_2_202110_1.xpfm
+    # build and run one of the following using u200 platform
+    make run TARGET=sw_emu DEVICE=/path/to/xilinx_u200_gen3x16_xdma_2_202110_1.xpfm
     
     # delete generated files
     make cleanall