Tutorial bugfixes and CI integration

.github/workflows/ci.yaml

@@ -13,10 +13,10 @@ jobs:
         os: [ubuntu-18.04, macos-latest]
         include:
           - os: macos-latest
-            install_deps: brew install llvm@9 pkg-config
+            install_deps: brew install llvm@9 pkg-config wget gzip
             path_extension: $(brew --prefix llvm@9)/bin
           - os: ubuntu-18.04
-            install_deps: sudo apt-get install llvm-9-tools llvm-9-dev pkg-config
+            install_deps: sudo apt-get install llvm-9-tools llvm-9-dev pkg-config wget gzip
             path_extension: /usr/lib/llvm-9/bin
 
     runs-on: ${{ matrix.os }}
@@ -37,12 +37,22 @@ jobs:
         ${{ matrix.install_deps }}
         echo "${{ matrix.path_extension }}" >> $GITHUB_PATH
 
+    - name: Get example files
+      run: |
+        wget http://yann.lecun.com/exdb/mnist/t10k-images-idx3-ubyte.gz
+        wget http://yann.lecun.com/exdb/mnist/t10k-labels-idx1-ubyte.gz
+        gunzip t10k-images-idx3-ubyte.gz t10k-labels-idx1-ubyte.gz
+        mv t10k-images-idx3-ubyte t10k-labels-idx1-ubyte $GITHUB_WORKSPACE/examples/
+
     - name: Cache
       uses: actions/cache@v2
       with:
         path: |
           ~/.stack
           $GITHUB_WORKSPACE/.stack-work
+          $GITHUB_WORKSPACE/examples/t10k-images-idx3-ubyte
+          $GITHUB_WORKSPACE/examples/t10k-labels-idx1-ubyte
+
         key: ${{ runner.os }}-${{ hashFiles('**/*.cabal', 'stack*.yaml') }}
         restore-keys: ${{ runner.os }}-
 
@@ -57,19 +67,6 @@ jobs:
 
     - name: Build
       run: make build
-
-    - name: Download MNist files
-      uses: suisei-cn/actions-download-file@v1
-      id: mnist 
-      with:
-          url: "https://github.com/srush/learns-dex/raw/main/mnist.bin"
-          target: examples/
-    - name: Download MNist labels file
-      uses: suisei-cn/actions-download-file@v1
-      id: labels 
-      with:
-          url: "https://github.com/srush/learns-dex/raw/main/labels.bin"
-          target: examples/
 
     - name: Run tests
       run: make tests

examples/tutorial.dx

@@ -292,9 +292,9 @@ def tableAdd' (x : m => n => Float32) (y : m => n => Float32) : m => n => Float3
 
 ' To run this section, move the following binary files to examples:
 
-' `wget https://github.com/srush/learns-dex/raw/main/mnist.bin`
+' `wget http://yann.lecun.com/exdb/mnist/t10k-images-idx3-ubyte.gz; gunzip t10k-images-idx3-ubyte.gz`
 
-' `wget https://github.com/srush/learns-dex/raw/main/labels.bin`
+' `wget http://yann.lecun.com/exdb/mnist/t10k-labels-idx1-ubyte.gz; gunzip t10k-labels-idx1-ubyte.gz`
 
 ' To make some of these concepts for tangible let us consider a real example
   using MNist digits. For this example we will first read in a batch of images
@@ -320,14 +320,16 @@ def pixel (x:Char) : Float32 =
              False -> r
 
 def getIm : Batch => Image =
-    (AsList _ im) = unsafeIO do readFile "examples/mnist.bin"
-    raw = unsafeCastTable Full im
+    -- File is unsigned bytes offset with 16 starting bytes
+    (AsList _ im) = unsafeIO do readFile "examples/t10k-images-idx3-ubyte"
+    raw = unsafeCastTable Full (for i:Batch. im.((ordinal i + 16) @ _))
     for b: Batch i j.
         pixel raw.((ordinal (b, i, j)) @ Full)
 
 def getLabel : Batch => Class =
-    (AsList _ im2) = unsafeIO do readFile "examples/labels.bin"
-    r = unsafeCastTable Batch im2
+    -- File is unsigned bytes offset with 8 starting bytes
+    (AsList _ lab) = unsafeIO do readFile "examples/t10k-labels-idx1-ubyte"
+    r = unsafeCastTable Batch (for i:Batch. lab.((ordinal i + 8) @ _))
     for i. (W8ToI r.i @ Class)
 
 ' Once you have downloaded the files, uncomment these lines to