If interpreter is specified set path to interpreter path not python (#…

…5720)
microsoft · May 3, 2021 · 8d84808 · 8d84808
1 parent c7d5fde
commit 8d84808
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -429,7 +429,7 @@ jobs:
  python -m pip install --upgrade -r ./build/conda-functional-requirements.txt
  python -m pip uninstall jedi --yes
  python -m pip install jedi==0.17.2
- conda install pytorch==1.8.0 torchvision==0.9.0 torchaudio==0.8.0 cpuonly -c pytorch
+ conda install pytorch cpuonly -c pytorch
 
  # Install PyTorch with pip
  - name: Install PyTorch on Windows and Linux
@@ -451,7 +451,7 @@ jobs:
  python ./pythonFiles/install_debugpy.py
  conda env update --file ./build/conda-functional-requirements.yml
  python -m pip install --upgrade -r ./build/conda-functional-requirements.txt
- conda install pytorch==1.8.0 torchvision==0.9.0 torchaudio==0.8.0 cpuonly -c pytorch
+ conda install pytorch cpuonly -c pytorch
 
  # This step is slow.
  - name: Install dependencies (npm ci)
@@ -687,7 +687,7 @@ jobs:
  python -m pip uninstall jedi --yes
  python -m pip install jedi==0.17.2
  beakerx_kernel_java install
- conda install pytorch==1.8.0 torchvision==0.9.0 torchaudio==0.8.0 cpuonly -c pytorch
+ conda install pytorch cpuonly -c pytorch
 
  # Install PyTorch with pip
  - name: Install PyTorch on Windows and Linux

diff --git a/src/client/datascience/jupyter/kernels/helpers.ts b/src/client/datascience/jupyter/kernels/helpers.ts
@@ -63,7 +63,7 @@ export function kernelConnectionMetadataHasKernelModel(
 export function getKernelId(spec: IJupyterKernelSpec, interpreter?: PythonEnvironment) {
  // Non-Python kernels cannot contain an interpreter (even in their id).
  interpreter = isPythonKernelSpec(spec) ? interpreter : undefined;
- return `${spec.id || ''}.${spec.name}.${spec.path}.${interpreter?.path || ''}.${
+ return `${spec.id || ''}.${spec.name}.${spec.interpreterPath || spec.path}.${interpreter?.path || ''}.${
  spec.display_name || interpreter?.displayName || ''
  }`;
 }

diff --git a/src/client/datascience/jupyter/kernels/jupyterKernelService.ts b/src/client/datascience/jupyter/kernels/jupyterKernelService.ts
@@ -146,6 +146,8 @@ export class JupyterKernelService {
  };
  }
 
+ traceInfo(`RegisterKernel for ${kernel.id}`);
+
  // Write out the contents into the new spec file
  try {
  await this.fs.writeLocalFile(kernelSpecFilePath, JSON.stringify(contents, undefined, 4));

diff --git a/src/client/datascience/notebook/notebookControllerManager.ts b/src/client/datascience/notebook/notebookControllerManager.ts
@@ -206,6 +206,7 @@ export class NotebookControllerManager implements INotebookControllerManager, IE
  });
 
  if (targetController) {
+ traceInfo(`TargetController found ID: ${targetController.id} for document ${document.uri.toString()}`);
  targetController.updateNotebookAffinity(document, NotebookControllerAffinity.Preferred);
 
  // When we set the target controller we don't actually get a selected event from our controllers