Skip to content

Commit 7e7bd91

Browse files
authored
Merge pull request #294 from lewagon/relax-pip-check-tf-cpu
Relax pip check tf cpu
2 parents 8518a99 + 084734b commit 7e7bd91

File tree

2 files changed

+42
-18
lines changed

2 files changed

+42
-18
lines changed

VM.md

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -75,34 +75,47 @@ We highly recommend installing [Windows Terminal](https://apps.microsoft.com/sto
7575
- Create a SSH key
7676

7777
<details>
78-
<summary markdown='span'>MacOS & Linux</summary>
78+
<summary markdown='span'>Windows</summary>
7979

8080
```bash
81-
EMAIL="[email protected]" # replace with your GCP account email
82-
ssh-keygen -t ed25519 -C $EMAIL
81+
# replace "[email protected]" with your GCP account email
82+
ssh-keygen.exe -t ed25519 -C "[email protected]"
8383
```
84-
8584
</details>
8685

8786
<details>
88-
<summary markdown='span'>Windows</summary>
87+
<summary markdown='span'>MacOS & Linux</summary>
8988

9089
```bash
91-
EMAIL="[email protected]" # replace with your GCP account email
92-
ssh-keygen.exe -t ed25519 -C $EMAIL
90+
# replace "[email protected]" with your GCP account email
91+
ssh-keygen -t ed25519 -C "[email protected]"
9392
```
9493
</details>
9594

95+
9696
You should get the following message: `> Generating public/private algorithm key pair.`
9797
- When you are prompted `> Enter a file in which to save the key`, press Enter
98-
- You should be asked to `Enter a passphrase`, type a secure passphrase, it is like a password, but longer.
98+
- 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.
9999

100100
ℹ️ Don't worry if nothing prompt when you type, that is perfectly normal for security reasons.
101101

102102
- You should be asked to `Enter same passphrase again`, do it.
103103

104104
**❗️ You must remember this passphrase.**
105105

106+
<details>
107+
<summary markdown='span'> ❗️ /home/your_username/.ssh/id_ed25519 already exists.</summary>
108+
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).
109+
110+
To create a separate SSH key to exclusively use for this bootcamp use the following:
111+
112+
```bash
113+
# replace "[email protected]" with your GCP account email
114+
ssh-keygen -t ed25519 -f ~/.ssh/de-bootcamp -C "[email protected]"
115+
```
116+
117+
Your new SSH Key will be named `de-bootcamp`. Make sure to remember it for later!
118+
</details>
106119

107120

108121
## Google Cloud Platform setup
@@ -256,13 +269,13 @@ _Note: The following section requires you already have a [Google Cloud Platform]
256269
- Region `europe-west1`, choose the closest one among the [available regions](https://cloud.google.com/compute/docs/regions-zones#available)
257270

258271
<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>
259-
- In the section `Machine configuration`
260-
- Select General purpose > e2-standard-4
272+
- In the section `Machine configuration` under the sub-heading `Machine type`
273+
- Select General purpose > PRESET > e2-standard-4
261274

262-
<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>
275+
<img alt="gcloud-console-vm-e2-standard4" src="https://wagon-public-assets.s3.eu-west-3.amazonaws.com/v9dv42llst8qjp2uj0d1yr00po1g" width=500>
263276
- Boot disk > Change
264277
- Operating system > Ubuntu
265-
- Version > Ubuntu 22.04 LTS
278+
- Version > Ubuntu 22.04 LTS x86/64
266279
- Boot disk type > Balanced persistent disk
267280
- Size > upgrade to 150GB
268281

@@ -275,9 +288,9 @@ _Note: The following section requires you already have a [Google Cloud Platform]
275288

276289
<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>
277290
- This opened a box `Edit network interface`
278-
- Go to the dropdown `External IPv4 address`, click on it, click on `CREATE IP ADDRESS`
291+
- Go to the dropdown `External IPv4 address`, click on it, click on `RESERVE STATIC EXTERNAL IP ADDRESS`
279292

280-
<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>
293+
<img alt="gcloud-console-vm-create-static-ip" src="https://wagon-public-assets.s3.eu-west-3.amazonaws.com/1ax09j2zld7x0lsvpp9p8ld8u5vc" width=300>
281294
- 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.
282295

283296
<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]
297310

298311
<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>
299312
- In your terminal display your public SSH key:
300-
```bash
301-
cat ~/.ssh/id_ed25519.pub
302-
```
313+
- Windows: navigate to where you created your SSH key and open `id_ed25519.pub`
314+
315+
- Mac/Linux users can use:
316+
```bash
317+
cat ~/.ssh/id_ed25519.pub
318+
# OR cat ~/.ssh/de-bootcamp.pub if you created a unique key
319+
```
303320
- Copy your public SSH key and paste it:
304321

305322
<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>
402419
```
403420
You can now change Host to whatever you would like to see as the name of your connection or in terminal with `ssh <Host>`!
404421
422+
❗️ It is important that the `Host` alias does not contain any whitespaces ❗️
423+
405424
```bash
406425
# For instance
407-
Host "data engineering bootcamp"
426+
Host "de-bootcamp-vm"
408427
HostName 35.240.107.210
409428
IdentityFile <file path for your ssh key>
410429
User <username>

checks/pip_check.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ for r in ${REQUIRED[@]}; do
2525
if [ $r = ${q} ]; then
2626
present=1
2727
fi
28+
if [ $r = 'tensorflow' ]; then
29+
if [ 'tensorflow-cpu' = $q ]; then
30+
present=1
31+
fi
32+
fi
2833
fi
2934
done
3035
if (($present == 0))

0 commit comments

Comments
 (0)