Merge pull request #294 from lewagon/relax-pip-check-tf-cpu

Relax pip check tf cpu

Author: julesvanrie

VM.md

@@ -75,34 +75,47 @@ We highly recommend installing [Windows Terminal](https://apps.microsoft.com/sto
 - Create a SSH key
 
 <details>
-  <summary markdown='span'>MacOS & Linux</summary>
+  <summary markdown='span'>Windows</summary>
 
 ```bash
-EMAIL="[email protected]" # replace with your GCP account email
-ssh-keygen -t ed25519 -C $EMAIL
+# replace "[email protected]" with your GCP account email
+ssh-keygen.exe -t ed25519 -C "[email protected]"
 ```
-
 </details>
 
 <details>
-  <summary markdown='span'>Windows</summary>
+  <summary markdown='span'>MacOS & Linux</summary>
 
 ```bash
-EMAIL="[email protected]" # replace with your GCP account email
-ssh-keygen.exe -t ed25519 -C $EMAIL
+# replace "[email protected]" with your GCP account email
+ssh-keygen -t ed25519 -C "[email protected]"
 ```
 </details>
 
+
 You should get the following message: `> Generating public/private algorithm key pair.`
 - When you are prompted `> Enter a file in which to save the key`, press Enter
-- You should be asked to `Enter a passphrase`, type a secure passphrase, it is like a password, but longer.
+- You should be asked to `Enter a passphrase` - this is optional if you want additional security. To continue without a passphrase press enter without typing anything when asked to enter a passphrase.
 
 ℹ️ Don't worry if nothing prompt when you type, that is perfectly normal for security reasons.
 
 - You should be asked to `Enter same passphrase again`, do it.
 
 **❗️ You must remember this passphrase.**
 
+<details>
+  <summary markdown='span'> ❗️ /home/your_username/.ssh/id_ed25519 already exists.</summary>
+If you receive this message, you may already have an SSH Key with the same name (if you are a Le Wagon Alumni or are using SSH Authentication with Github).
+
+To create a separate SSH key to exclusively use for this bootcamp use the following:
+
+```bash
+# replace "[email protected]" with your GCP account email
+ssh-keygen -t ed25519 -f ~/.ssh/de-bootcamp -C "[email protected]"
+```
+
+Your new SSH Key will be named `de-bootcamp`. Make sure to remember it for later!
+</details>
 
 
 ## Google Cloud Platform setup
@@ -256,13 +269,13 @@ _Note: The following section requires you already have a [Google Cloud Platform]
 - Region `europe-west1`, choose the closest one among the [available regions](https://cloud.google.com/compute/docs/regions-zones#available)
 
     <img alt="gcloud-console-vm-create-instance" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-create-instance.png" width=500>
-- In the section `Machine configuration`
-- Select General purpose > e2-standard-4
+- In the section `Machine configuration` under the sub-heading `Machine type`
+- Select General purpose > PRESET > e2-standard-4
 
-    <img alt="gcloud-console-vm-e2-standard4" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-e2-standard4.png" width=500>
+    <img alt="gcloud-console-vm-e2-standard4" src="https://wagon-public-assets.s3.eu-west-3.amazonaws.com/v9dv42llst8qjp2uj0d1yr00po1g" width=500>
 - Boot disk > Change
   - Operating system > Ubuntu
-  - Version > Ubuntu 22.04 LTS
+  - Version > Ubuntu 22.04 LTS x86/64
   - Boot disk type > Balanced persistent disk
   - Size > upgrade to 150GB
 
@@ -275,9 +288,9 @@ _Note: The following section requires you already have a [Google Cloud Platform]
 
     <img alt="gcloud-console-vm-network-interfaces" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-network-interfaces.png" width=500>
 - This opened a box `Edit network interface`
-- Go to the dropdown `External IPv4 address`, click on it, click on `CREATE IP ADDRESS`
+- Go to the dropdown `External IPv4 address`, click on it, click on `RESERVE STATIC EXTERNAL IP ADDRESS`
 
-    <img alt="gcloud-console-vm-create-static-ip" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-vm-create-static-ip.png" width=300>
+    <img alt="gcloud-console-vm-create-static-ip" src="https://wagon-public-assets.s3.eu-west-3.amazonaws.com/1ax09j2zld7x0lsvpp9p8ld8u5vc" width=300>
 - Give it a name, like "lewagon-data-eng-vm-ip-<github_username>" (replace `<github_username>` with your own) and description "Le Wagon - Data Engineering VM IP". This will take a few seconds.
 
     <img alt="gcloud-console-reserve-static-ip" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-reserve-static-ip.png" width=300>
@@ -297,9 +310,13 @@ _Note: The following section requires you already have a [Google Cloud Platform]
 
     <img alt="gcloud-console-add-manual-ssh-key" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-add-manual-ssh-key.png" width=500>
 - In your terminal display your public SSH key:
-    ```bash
-    cat ~/.ssh/id_ed25519.pub
-    ```
+    - Windows: navigate to where you created your SSH key and open `id_ed25519.pub`
+
+    - Mac/Linux users can use:
+        ```bash
+        cat ~/.ssh/id_ed25519.pub
+        # OR cat ~/.ssh/de-bootcamp.pub if you created a unique key
+        ```
 - Copy your public SSH key and paste it:
 
     <img alt="gcloud-console-add-ssh-key-pub" src="https://wagon-public-datasets.s3.amazonaws.com/data-engineering/setup/gcloud-console-add-ssh-key-pub.png" width=500>
@@ -402,9 +419,11 @@ Host <machine ip>
 ```
 You can now change Host to whatever you would like to see as the name of your connection or in terminal with `ssh <Host>`!
 
+❗️ It is important that the `Host` alias does not contain any whitespaces ❗️
+
 ```bash
 # For instance
-Host "data engineering bootcamp"
+Host "de-bootcamp-vm"
   HostName 35.240.107.210
   IdentityFile <file path for your ssh key>
   User <username>

checks/pip_check.sh

@@ -25,6 +25,11 @@ for r in ${REQUIRED[@]}; do
       if [ $r = ${q} ]; then
         present=1
       fi
+      if [ $r = 'tensorflow' ]; then
+        if [ 'tensorflow-cpu' = $q ]; then
+          present=1
+        fi
+      fi
     fi
   done
   if (($present == 0))