update

Author: AndSonder

docs/18_triton/01_triton_programming_paradigms/homework.ipynb

@@ -1,23 +1,6 @@
 {
  "cells": [
   {
-<<<<<<< HEAD
-=======
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Triton 编程范式 - 课后练习\n",
-    "\n",
-    "本 Notebook 包含三个练习，帮助你巩固 Triton 的核心概念。\n",
-    "\n",
-    "**学习目标**：\n",
-    "- 掌握 Triton 的基本语法和向量化操作\n",
-    "- 理解 `BLOCK_SIZE` 对性能的影响\n",
-    "- 学会用向量化方式处理复杂的数据访问模式"
-   ]
-  },
-  {
->>>>>>> 70260cb4e92d1f3168960cda1b5e9d466d6b9a28
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
@@ -219,18 +202,6 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-<<<<<<< HEAD
-=======
-    "**思考题**（高级）：\n",
-    "1. 为什么这种方法效率不高？（提示：重复加载）\n",
-    "2. 如何优化？（提示：加载更大的块然后切片）"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
->>>>>>> 70260cb4e92d1f3168960cda1b5e9d466d6b9a28
     "---\n",
     "\n",
     "## 总结\n",
@@ -283,11 +254,7 @@
     "    mask = offsets < n_elements\n",
     "    \n",
     "    x_center = tl.load(x_ptr + offsets, mask=mask, other=0.0)\n",
-<<<<<<< HEAD
     "    x_left = tl.load(x_ptr + offsets - 1, mask=mask & (offsets > 0), other=0.0)\n",
-=======
-    "    x_left = tl.load(x_ptr + offsets - 1, mask=offsets > 0, other=0.0)\n",
->>>>>>> 70260cb4e92d1f3168960cda1b5e9d466d6b9a28
     "    x_right = tl.load(x_ptr + offsets + 1, mask=offsets < n_elements - 1, other=0.0)\n",
     "    \n",
     "    y = x_left + x_center + x_right\n",